From 449cbd815ed8a0fcacba22ef2acf0c2b46a5e751 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Thu, 15 May 2008 09:45:33 +0000
Subject: [PATCH] * Continue parsing macro tags even if it is a comment. This
 is the only   way we can correctly catch embedded macros. Fixes bug 588.  
 http://helma.org/bugs/show_bug.cgi?id=588

---
 src/helma/framework/core/Skin.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/helma/framework/core/Skin.java b/src/helma/framework/core/Skin.java
index 55637138..712697a3 100644
--- a/src/helma/framework/core/Skin.java
+++ b/src/helma/framework/core/Skin.java
@@ -437,13 +437,8 @@ public final class Skin {
 
                         if (state == PARSE_MACRONAME && "//".equals(b.toString())) {
                             isCommentMacro = true;
-                            // search macro end tag
-                            while (i < length - 1 &&
-                                       (source[i] != '%' || source[i + 1] != '>')) {
-                                i++;
-                            }
-                            state = PARSE_DONE;
-                            break loop;
+                            // just continue parsing the macro as this is the only way
+                            // to correctly catch embedded macros - see bug 588
                         }
                         break;