r32 - waf/trunk/src/com/arsdigita/bebop/jsp

[Richard Li <richardl@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Author: richardl
Date: 2004-11-30 18:01:48 +0100 (Tue, 30 Nov 2004)
New Revision: 32

Modified:
   waf/trunk/src/com/arsdigita/bebop/jsp/DefinePage.java
Log:
Fix 300929: define:page tag does not create new bebop.Page object when jsp 
file is modified. Thanks to Tuan Nguyen for the patch.


Modified: waf/trunk/src/com/arsdigita/bebop/jsp/DefinePage.java
===================================================================
--- waf/trunk/src/com/arsdigita/bebop/jsp/DefinePage.java       2004-10-05 
22:13:44 UTC (rev 31)
+++ waf/trunk/src/com/arsdigita/bebop/jsp/DefinePage.java       2004-11-30 
17:01:48 UTC (rev 32)
@@ -121,12 +121,27 @@
                                 continue;
                             }
                         }
+                        if (s_log.isDebugEnabled()) {
+                            s_log.debug("JSP file is NOT newer than cached 
bebop Page. Reusing Page object.");
+                        }
+                        m_page = (Page) pair[0];
+                        pageContext.setAttribute(getName(), m_page);
+                        return SKIP_BODY;
+                    } else {
+                        if (s_log.isDebugEnabled()) {
+                            s_log.debug("JSP file is NEWER than cached bebop 
Page.");
+                            s_log.debug(Thread.currentThread().getName() + " 
rebuilding bebop Page.");
+                        }
+                        m_page = buildPage();
+                        s_pageCache.put(cacheKey,
+                                        new Object[] {m_page,
+                                                      new 
Long(System.currentTimeMillis())});
+                        return EVAL_BODY_BUFFERED;
                     }
-                    m_page = (Page)pair[0];
-                    pageContext.setAttribute(getName(), m_page);
-                    return SKIP_BODY;
                 }
-                
+                if (s_log.isDebugEnabled()) {
+                    s_log.debug(Thread.currentThread().getName() + " found 
no bebop Page in cache, building it.");
+                }
                 m_page = buildPage();
                 s_pageCache.put(cacheKey,
                                 new Object[] {m_page,