You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/09/19 11:40:37 UTC

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

Author: rombert
Date: Tue Sep 19 11:40:37 2017
New Revision: 1808864

URL: http://svn.apache.org/viewvc?rev=1808864&view=rev
Log:
SLING-7139 - ScriptEngineManagerFactory does not register ScriptEngineFactory references

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=1808864&r1=1808863&r2=1808864&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 Tue Sep 19 11:40:37 2017
@@ -55,14 +55,7 @@ import org.slf4j.LoggerFactory;
  * Component which exposes a ScriptEngineManager service.
  *
  */
-@Component(service = {},
-    reference = @Reference(
-        name = "ScriptEngineFactory",
-        service = ScriptEngineFactory.class,
-        policy = ReferencePolicy.DYNAMIC,
-        cardinality = ReferenceCardinality.MULTIPLE
-    )
-)
+@Component(service = {})
 public class ScriptEngineManagerFactory implements BundleListener {
 
     private final Logger log = LoggerFactory.getLogger(ScriptEngineManagerFactory.class);
@@ -227,6 +220,9 @@ public class ScriptEngineManagerFactory
         this.bundleContext = null;
     }
 
+    @Reference(service = ScriptEngineFactory.class,
+            policy = ReferencePolicy.DYNAMIC,
+            cardinality = ReferenceCardinality.MULTIPLE)
     protected void bindScriptEngineFactory(final ScriptEngineFactory scriptEngineFactory, final Map<Object, Object> props) {
         if (scriptEngineFactory != null) {
             synchronized ( this.engineSpiServices) {