Changeset 830

Timestamp:

2008-11-26 10:01:14 (4 years ago)

Author:

jgou

Message:

• fix for nasty little bug : executing the next step without checking the escape condition

a lesson learned: be careful (or avoid) when bypassing the template executor

• improved test (to discover bug)

Location:

trunk/universe/kauri-template/src

Files:

• main/java/org/kauriproject/template/MacroBlock.java (modified) (1 diff)
• test/resources/org/kauriproject/template/inherit.xml (modified) (1 diff)
• test/resources/org/kauriproject/template/inherit_multiple_result.xml (modified) (1 diff)
• test/resources/org/kauriproject/template/inherit_result.xml (modified) (1 diff)

trunk/universe/kauri-template/src/main/java/org/kauriproject/template/MacroBlock.java

@@ -93 +93 @@
             callerRegistry.put(getName(), null);
 
-            return next.executeAndProceed(context, result);
+            return next;
         }
 

trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/inherit.xml

@@ -15 +15 @@
                 </ktl:block>
             </div>
+            <ktl:macro name="mac">
+                <p>macro defined in child</p>
+            </ktl:macro>
+            <ktl:callMacro name="mac" />
         </ktl:block>
     </body>

trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/inherit_multiple_result.xml

@@ -16 +16 @@
             <p>overriding block defined in parent</p>
         </div>
+        <p>macro defined in child</p>
         <p>trailing stuff from base</p>
     </body>

trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/inherit_result.xml

@@ -12 +12 @@
             <p>block defined in child</p>
         </div>
+        <p>macro defined in child</p>
         <p>trailing stuff from base</p>
     </body>