commit 3a4ea3882e5f298345b4570a5b6928d334bce0ae
author ddekany <ddekany@freemail.hu> Wed Jul 31 12:37:32 2013 +0200
committer ddekany <ddekany@freemail.hu> Wed Jul 31 12:37:32 2013 +0200
tree ae9a3a4cb5e2a5e46183d8fd5501a95dd97416d1
parent bf61b7bb5bef86496fd29eda1995ce7755381e11

Removed DebugBreak.suspendAfter; we simply shouldn't allow setting breakpoint on end-tags for now. The correct implementation of that would be much more complicated.

src/main/java/freemarker/core/DebugBreak.java

diff --git a/src/main/java/freemarker/core/DebugBreak.java b/src/main/java/freemarker/core/DebugBreak.java
index 5ed1848..c1c22b7 100644
--- a/src/main/java/freemarker/core/DebugBreak.java
+++ b/src/main/java/freemarker/core/DebugBreak.java
@@ -64,7 +64,6 @@
 public class DebugBreak extends TemplateElement
 {
     private final DebuggerService debuggerService;    
-    private final boolean suspendAfter;
     private final String templateName;
     
     public DebugBreak(TemplateElement nestedBlock, DebuggerService debuggerService, Breakpoint breakpoint)
@@ -74,36 +73,18 @@
         copyLocationFrom(nestedBlock);
         this.debuggerService = debuggerService;
 
-        // Debug Break must be suspended before or after the TemplateElement te
-        // founded.
-        // After suspend, must be done when breakpoint line is not the same
-        // than the TemplateElement
-        // (ex : breakpoint added to </#if> must be executed before to execute
-        // the whole ConditionnalBlock and suspend to the </#if>)
-        boolean suspendAfter = (nestedBlock.getBeginLine() != breakpoint
-                .getLine());
-        this.suspendAfter = suspendAfter;
         this.templateName = breakpoint.getTemplateName();
     }
     
     protected void accept(Environment env) throws TemplateException, IOException
     {
-        int line = 0;
-        if (suspendAfter) {
-            // Suspend must be done after the execution of the nestedBlock
-            line = nestedBlock.getEndLine();
+        if(!debuggerService.suspendEnvironment(env, templateName, nestedBlock.getBeginLine()))
+        {
             nestedBlock.accept(env);
-        } else {
-            // Suspend must be done before the execution of the nestedBlock
-            line = nestedBlock.getBeginLine();
         }
-
-        if (debuggerService.suspendEnvironment(env, templateName, line)) {
-            if (!suspendAfter) {
-                nestedBlock.accept(env);
-            }
-        } else {
-            throw new StopException(env, "Stopped by debugger");
+        else
+        {
+            throw new StopException(env, "Stopped by debugger");        
         }
     }