svn commit: r1696206 - /jackrabbit/oak/trunk/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java

[ch...@apache.org]

Author: chetanm
Date: Mon Aug 17 08:19:53 2015
New Revision: 1696206

URL: http://svn.apache.org/r1696206
Log:
OAK-3185 - Port and refactor jackrabbit-webapp module to Oak (WIP)

With r1695031 in memory access to repository instance was enabled. Now as AbstractRepositoryServlet registers a repository instance with ServletContext by default (even if repository not initialized) this causes issues with RepositoryAccessServlet as it assumes that repository is ready.

To fix that the repository instance would only registered with ServletContext when it is ready

Modified:
    jackrabbit/oak/trunk/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java

Modified: jackrabbit/oak/trunk/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java?rev=1696206&r1=1696205&r2=1696206&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java (original)
+++ jackrabbit/oak/trunk/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java Mon Aug 17 08:19:53 2015
@@ -216,7 +216,6 @@ public class RepositoryStartupServlet ex
      * another initialization error occurs.
      */
     public void init() throws ServletException {
-        super.init();
         // check if servlet is defined twice
         if (getServletContext().getAttribute(CTX_PARAM_THIS) !=  null) {
             throw new ServletException("Only one repository startup servlet allowed per web-app.");
@@ -253,6 +252,13 @@ public class RepositoryStartupServlet ex
                 registerRMI();
                 registerJNDI();
             }
+
+            //Once repository is initialized get its instances bounded to ServletContext
+            //via super class init
+            if (repository != null){
+                super.init();
+            }
+
             log.info("RepositoryStartupServlet initialized.");
         } catch (ServletException e) {
             // shutdown repository