incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1446249 - /sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/ClassLoaderWriterImpl.java
Date Thu, 14 Feb 2013 15:53:26 GMT
Author: cziegeler
Date: Thu Feb 14 15:53:26 2013
New Revision: 1446249

URL: http://svn.apache.org/r1446249
Log:
SLING-2732 :   NPE when getting new repository class loader 

Modified:
    sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/ClassLoaderWriterImpl.java

Modified: sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/ClassLoaderWriterImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/ClassLoaderWriterImpl.java?rev=1446249&r1=1446248&r2=1446249&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/ClassLoaderWriterImpl.java
(original)
+++ sling/trunk/bundles/jcr/classloader/src/main/java/org/apache/sling/jcr/classloader/internal/ClassLoaderWriterImpl.java
Thu Feb 14 15:53:26 2013
@@ -168,14 +168,12 @@ public class ClassLoaderWriterImpl
      */
     private void destroyRepositoryClassLoader() {
         if (this.repositoryClassLoader != null) {
+            if ( this.dynamicClassLoaderManager != null ) {
+                this.callerBundle.getBundleContext().ungetService(this.dynamicClassLoaderManager);
+            }
             this.repositoryClassLoader.destroy();
             this.repositoryClassLoader = null;
         }
-
-        if (this.dynamicClassLoaderManager != null) {
-            this.callerBundle.getBundleContext().ungetService(this.dynamicClassLoaderManager);
-            this.dynamicClassLoaderManager = null;
-        }
     }
 
     /**



Mime
View raw message