Author: apetrelli
Date: Tue Dec  5 04:59:13 2006
New Revision: 482630

URL: http://svn.apache.org/viewvc?view=rev&rev=482630
Log:
Fixed DefinitionsFactory refresh.

Modified:
    
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java
    
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java?view=diff&rev=482630&r1=482629&r2=482630
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java
 Tue Dec  5 04:59:13 2006
@@ -35,4 +35,12 @@
      * reloaded.
      */
     public boolean refreshRequired();
+    
+    /**
+     * Refreshes the stored definitions, reloading them.
+     * 
+     * @throws DefinitionsFactoryException If something goes wrong during
+     * refresh.
+     */
+    public void refresh() throws DefinitionsFactoryException;
 }

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java?view=diff&rev=482630&r1=482629&r2=482630
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
 Tue Dec  5 04:59:13 2006
@@ -74,11 +74,11 @@
                 if (factory instanceof ReloadableDefinitionsFactory) {
                     ReloadableDefinitionsFactory rFactory = 
(ReloadableDefinitionsFactory) factory;
                     if (rFactory.refreshRequired()) {
-                        rFactory.refreshRequired();
+                        rFactory.refresh();
                     }
                 }
-                chain.doFilter(request, response);
             }
+            chain.doFilter(request, response);
         } catch (Exception e) {
             throw new ServletException("Error processing request.", e);
         }


Reply via email to