You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/12/12 12:31:06 UTC
svn commit: r1773782 -
/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
Author: cziegeler
Date: Mon Dec 12 12:31:05 2016
New Revision: 1773782
URL: http://svn.apache.org/viewvc?rev=1773782&view=rev
Log:
SLING-6353 : Test failure with SLING-6288 in HTL ITs
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java?rev=1773782&r1=1773781&r2=1773782&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java Mon Dec 12 12:31:05 2016
@@ -70,6 +70,8 @@ import org.osgi.service.component.annota
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.Designate;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@@ -179,7 +181,6 @@ default.is.session.description = Should
private ServletContext slingServletContext;
- @Reference
private ClassLoaderWriter classLoaderWriter;
@Reference
@@ -552,6 +553,7 @@ default.is.session.description = Should
*
* @param repositoryClassLoaderProvider the new provider
*/
+ @Reference(cardinality=ReferenceCardinality.MANDATORY, policy=ReferencePolicy.STATIC)
protected void bindDynamicClassLoaderManager(final DynamicClassLoaderManager rclp) {
if ( this.dynamicClassLoader != null ) {
this.ungetClassLoader();