svn commit: r1731873 - /sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java

[radu]

Author: radu
Date: Tue Feb 23 14:57:09 2016
New Revision: 1731873

URL: http://svn.apache.org/viewvc?rev=1731873&view=rev
Log:
SLING-5543 - Sightly Use POJOs with CR+LF line endings are not compiled 
correctly

* improved package declaration matching regex to take into account whitespace
* optimised package declaration search to break after first match

Modified:
    
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java

Modified: 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java?rev=1731873&r1=1731872&r2=1731873&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
 Tue Feb 23 14:57:09 2016
@@ -68,7 +68,7 @@ public class SightlyJavaCompilerService
 
     private static final Logger LOG = 
LoggerFactory.getLogger(SightlyJavaCompilerService.class);
 
-    public static final Pattern PACKAGE_DECL_PATTERN = 
Pattern.compile("package\\s+([a-zA-Z_$][a-zA-Z\\d_$]*\\.?)+;");
+    public static final Pattern PACKAGE_DECL_PATTERN = 
Pattern.compile("(\\s*)package\\s+([a-zA-Z_$][a-zA-Z\\d_$]*\\.?)+;");
 
     @Reference
     private ClassLoaderWriter classLoaderWriter = null;
@@ -176,6 +176,7 @@ public class SightlyJavaCompilerService
                  * SightlyJavaCompilerService will add one.
                  */
                 foundPackageDeclaration = true;
+                break;
             }
         }