svn commit: r785224 - /incubator/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java

[bdelacretaz]

Author: bdelacretaz
Date: Tue Jun 16 14:19:32 2009
New Revision: 785224

URL: http://svn.apache.org/viewvc?rev=785224&view=rev
Log:
SLING-490 - make SystemStatus service optional, until we agree on how to 
implement it

Modified:
    
incubator/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java

Modified: 
incubator/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=785224&r1=785223&r2=785224&view=diff
==============================================================================
--- 
incubator/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
 (original)
+++ 
incubator/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
 Tue Jun 16 14:19:32 2009
@@ -268,8 +268,6 @@
                 errorMessage = "ServletResolver" + serviceMissingSuffix;
             } else if (mimeTypeService == null) {
                 errorMessage = "MimeTypeService" + serviceMissingSuffix;
-            } else if(systemStatus == null) {
-                errorMessage = "SystemStatus" + serviceMissingSuffix;
             }
 
             // get JCR Session
@@ -279,7 +277,7 @@
             }
 
             // system ready?
-            if(errorMessage == null) {
+            if(errorMessage == null && systemStatus != null) {
                 try {
                     systemStatus.checkSystemReady();
                 } catch(Exception e) {
@@ -295,7 +293,7 @@
             }
 
             // status request?
-            if(SystemStatus.STATUS_PATH.equals(request.getPathInfo())) {
+            if(SystemStatus.STATUS_PATH.equals(request.getPathInfo()) && 
systemStatus != null) {
                 systemStatus.doGet(request, response);
                 return;
             }