svn commit: r1780935 - /sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java

[rombert]

Author: rombert
Date: Mon Jan 30 16:36:55 2017
New Revision: 1780935

URL: http://svn.apache.org/viewvc?rev=1780935&view=rev
Log:
SLING-6499 - SlingDavExServlet protectedhandlers-config parameter not 
propagated to ServletConfig

Ensure that protectedhandlers-config is marked as a servlet init parameter.

Modified:
    
sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java

Modified: 
sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java?rev=1780935&r1=1780934&r2=1780935&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
 (original)
+++ 
sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
 Mon Jan 30 16:36:55 2017
@@ -126,7 +126,7 @@ public class SlingDavExServlet extends J
         initProps.put(toInitParamProperty(INIT_PARAM_RESOURCE_PATH_PREFIX), 
davRoot);
         initProps.put(toInitParamProperty(INIT_PARAM_CREATE_ABSOLUTE_URI), 
Boolean.toString(createAbsoluteUri));
         initProps.put(toInitParamProperty(INIT_PARAM_CSRF_PROTECTION), 
CSRFUtil.DISABLED);
-        initProps.put(INIT_PARAM_PROTECTED_HANDLERS_CONFIG, protectedHandlers);
+        
initProps.put(toInitParamProperty(INIT_PARAM_PROTECTED_HANDLERS_CONFIG), 
protectedHandlers);
         initProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, 
davRoot.concat("/*"));
         initProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
             "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" + 
AuthHttpContext.HTTP_CONTEXT_NAME + ")");