svn commit: r745526 - /incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java

[fmeschbe]

Author: fmeschbe
Date: Wed Feb 18 14:35:10 2009
New Revision: 745526

URL: http://svn.apache.org/viewvc?rev=745526&view=rev
Log:
SLING-863 Null internal module cache on bundle stop and start (just to be sure)

Modified:
    
incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java

Modified: 
incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java?rev=745526&r1=745525&r2=745526&view=diff
==============================================================================
--- 
incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
 (original)
+++ 
incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
 Wed Feb 18 14:35:10 2009
@@ -93,8 +93,12 @@
 
     public void start(BundleContext context) {
 
-        this.bundleContext = context;
+        bundleContext = context;
 
+        // ensure the module cache is not set right now, this may
+        // (theoretically) be non-null after the last bundle stop
+        moduleCache = null;
+        
         // check the name of the default context, nothing to do if none
         slingContext = context.getProperty(SLING_CONTEXT_DEFAULT);
         if (slingContext == null) {
@@ -139,6 +143,9 @@
             // exception is always thrown
         }
         
+        // drop module cache
+        moduleCache = null;
+
         // close the loginModuleTracker
         if (loginModuleTracker != null) {
             loginModuleTracker.close();