Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 98534 invoked from network); 9 Nov 2007 19:48:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Nov 2007 19:48:47 -0000 Received: (qmail 54759 invoked by uid 500); 9 Nov 2007 19:48:35 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 54725 invoked by uid 500); 9 Nov 2007 19:48:35 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 54714 invoked by uid 99); 9 Nov 2007 19:48:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Nov 2007 11:48:35 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Nov 2007 19:49:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F36DA1A9832; Fri, 9 Nov 2007 11:48:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r593636 - in /geronimo/server/trunk/framework/modules/geronimo-system/src: main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java Date: Fri, 09 Nov 2007 19:48:23 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071109194823.F36DA1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Fri Nov 9 11:48:22 2007 New Revision: 593636 URL: http://svn.apache.org/viewvc?rev=593636&view=rev Log: handle nested blocks in expression parser Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java?rev=593636&r1=593635&r2=593636&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java Fri Nov 9 11:48:22 2007 @@ -149,7 +149,7 @@ break; } - suffixLoc = input.indexOf("}", prefixLoc); + suffixLoc = findBlockEnd(prefixLoc + 2, input); if (suffixLoc < 0) { throw new RuntimeException("Missing '}': " + input); } @@ -176,6 +176,24 @@ return buff.toString(); } + private int findBlockEnd(int pos, String input) { + int nested = 0; + while (pos < input.length()) { + char ch = input.charAt(pos); + if (ch == '{') { + nested++; + } else if (ch == '}') { + if (nested == 0) { + return pos; + } else { + nested--; + } + } + pos++; + } + return -1; + } + public String parse(final String input, final boolean trim) { String output = parse(input); if (trim && output != null) { Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java?rev=593636&r1=593635&r2=593636&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/ServerOverrideTest.java Fri Nov 9 11:48:22 2007 @@ -272,6 +272,10 @@ gbean.setAttribute("expression", "${if (java == null) 'null'; else 'non-null';}"); gbean.applyOverrides(data, null, null, getClass().getClassLoader()); assertEquals("non-null", data.getAttribute("expression")); + + gbean.setAttribute("expression", "${if (java == null) { 'null'; } else { if (os == null) { 'java,null'; } else { 'java,non-null'; } } }"); + gbean.applyOverrides(data, null, null, getClass().getClassLoader()); + assertEquals("java,non-null", data.getAttribute("expression")); } private void assertCopyIdentical(ServerOverride server) throws Exception {