Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5718D70E9 for ; Tue, 15 Nov 2011 09:11:13 +0000 (UTC) Received: (qmail 70118 invoked by uid 500); 15 Nov 2011 09:11:13 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 70071 invoked by uid 500); 15 Nov 2011 09:11:13 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 70064 invoked by uid 99); 15 Nov 2011 09:11:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Nov 2011 09:11:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Nov 2011 09:11:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 20964238897F; Tue, 15 Nov 2011 09:10:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1202102 - /sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerUtil.java Date: Tue, 15 Nov 2011 09:10:52 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111115091052.20964238897F@eris.apache.org> Author: cziegeler Date: Tue Nov 15 09:10:51 2011 New Revision: 1202102 URL: http://svn.apache.org/viewvc?rev=1202102&view=rev Log: SLING-2282 : Java Script Engine does not escape directory paths Modified: sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerUtil.java Modified: sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerUtil.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerUtil.java?rev=1202102&r1=1202101&r2=1202102&view=diff ============================================================================== --- sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerUtil.java (original) +++ sling/trunk/contrib/scripting/java/src/main/java/org/apache/sling/scripting/java/impl/CompilerUtil.java Tue Nov 15 09:10:51 2011 @@ -30,11 +30,22 @@ public class CompilerUtil { } else { str = path; } - final int pos = str.lastIndexOf("/"); - if ( pos == -1 ) { - return makeJavaIdentifier(str); + final StringBuilder sb = new StringBuilder(); + int pos = 0; + int start = 0; + while ( pos < str.length() ) { + final char c = str.charAt(pos); + if ( c == '/' ) { + if ( start != pos ) { + sb.append(makeJavaIdentifier(str.substring(start, pos))); + } + sb.append(c); + start = pos + 1; + } + pos++; } - return str.substring(0, pos + 1) + makeJavaIdentifier(str.substring(pos + 1)); + sb.append(makeJavaIdentifier(str.substring(start))); + return sb.toString(); } /**