Author: justin
Date: Wed Oct 20 19:32:27 2010
New Revision: 1025692
URL: http://svn.apache.org/viewvc?rev=1025692&view=rev
Log:
SLING-1848 - adding extra calls to refreshScriptEngineManager()
Modified:
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java
Modified:
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java?rev=1025692&r1=1025691&r2=1025692&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java
(original)
+++
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java
Wed Oct 20 19:32:27 2010
@@ -247,7 +247,10 @@ public class ScriptEngineManagerFactory
protected void bindScriptEngineFactory(ScriptEngineFactory
scriptEngineFactory) {
synchronized ( this ) {
this.engineSpiServices.add(scriptEngineFactory);
- this.scriptEngineManager = null;
+ if ( this.scriptEngineManager != null ) {
+ this.scriptEngineManager = null;
+ this.refreshScriptEngineManager();
+ }
}
// send event
postEvent(SlingScriptConstants.TOPIC_SCRIPT_ENGINE_FACTORY_ADDED,
scriptEngineFactory);
@@ -256,7 +259,10 @@ public class ScriptEngineManagerFactory
protected void unbindScriptEngineFactory(ScriptEngineFactory
scriptEngineFactory) {
synchronized ( this ) {
if ( this.engineSpiServices.remove(scriptEngineFactory) ) {
- this.scriptEngineManager = null;
+ if ( this.scriptEngineManager != null ) {
+ this.scriptEngineManager = null;
+ this.refreshScriptEngineManager();
+ }
}
}
// send event
