svn commit: r1692141 - /sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java

[radu]

Author: radu
Date: Tue Jul 21 15:05:41 2015
New Revision: 1692141

URL: http://svn.apache.org/r1692141
Log:
SLING-4896 - A race condition can prevent correctly disabling the EventHandler 
created by the ScriptCache implementation

* made sure the eventHandlerServiceRegistration is nullified on configuration 
change events

Modified:
    
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java

Modified: 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java?rev=1692141&r1=1692140&r2=1692141&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
 (original)
+++ 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
 Tue Jul 21 15:05:41 2015
@@ -233,6 +233,7 @@ public class ScriptCacheImpl implements
         try {
             if (eventHandlerServiceRegistration != null) {
                 eventHandlerServiceRegistration.unregister();
+                eventHandlerServiceRegistration = null;
             }
             internalMap.clear();
             extensions.addAll(Arrays.asList(additionalExtensions));