svn commit: r1413570 - /sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java

[cziegeler]

Author: cziegeler
Date: Mon Nov 26 12:10:26 2012
New Revision: 1413570

URL: http://svn.apache.org/viewvc?rev=1413570&view=rev
Log:
SLING-2677 :  Compilation should work with no provided class loader 

Modified:
    
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java

Modified: 
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java?rev=1413570&r1=1413569&r2=1413570&view=diff
==============================================================================
--- 
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
 (original)
+++ 
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
 Mon Nov 26 12:10:26 2012
@@ -83,17 +83,24 @@ public class EclipseJavaCompiler impleme
         } else if ( options.get(Options.KEY_ADDITIONAL_CLASS_LOADER) != null ) 
{
             final ClassLoader additionalClassLoader = 
(ClassLoader)options.get(Options.KEY_ADDITIONAL_CLASS_LOADER);
             loader = new ClassLoader(classLoaderWriter.getClassLoader()) {
+                @Override
                 protected Class<?> findClass(String name)
                 throws ClassNotFoundException {
                     return additionalClassLoader.loadClass(name);
                 }
 
+                @Override
                 protected URL findResource(String name) {
                     return additionalClassLoader.getResource(name);
                 }
             };
         } else {
-            loader = classLoaderWriter.getClassLoader();
+            final ClassLoader cl = classLoaderWriter.getClassLoader();
+            if ( cl == null ) {
+                loader = this.classLoaderWriter.getClassLoader();
+            } else {
+                loader = cl;
+            }
         }
         return loader;
     }