jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chet...@apache.org
Subject svn commit: r1717753 - /jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java
Date Thu, 03 Dec 2015 12:45:52 GMT
Author: chetanm
Date: Thu Dec  3 12:45:52 2015
New Revision: 1717753

URL: http://svn.apache.org/viewvc?rev=1717753&view=rev
Log:
JCR-3934 - Error occured while loading protected handler config in JcrRemotingServlet

Earlier logic allowed interpreting the config value as literal class name. With last change
this case was not handled. Fixing that

Modified:
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java?rev=1717753&r1=1717752&r2=1717753&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java
Thu Dec  3 12:45:52 2015
@@ -274,10 +274,13 @@ public abstract class JcrRemotingServlet
         String protectedHandlerConfig = getServletConfig().getInitParameter(INIT_PARAM_PROTECTED_HANDLERS_CONFIG);
         InputStream in = null;
         try {
-            protectedRemoveManager = new ProtectedRemoveManager();
             in = getServletContext().getResourceAsStream(protectedHandlerConfig);
             if (in != null){
+                protectedRemoveManager = new ProtectedRemoveManager();
                 protectedRemoveManager.load(in);
+            } else {
+                //Config might be direct class implementation
+                protectedRemoveManager = new ProtectedRemoveManager(protectedHandlerConfig);
             }
         } catch (IOException e) {
             log.debug("Unable to create ProtectedRemoveManager from " + protectedHandlerConfig
, e);



Mime
View raw message