Improve CMS start up and status reporting.

[lgpl/argeo-commons.git] / org.argeo.cms.ee / src / org / argeo / cms / websocket / server / CmsWebSocketConfigurator.java

diff --git a/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/CmsWebSocketConfigurator.java b/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/CmsWebSocketConfigurator.java
index 279b610b6edf8cb9d0ef57943cde4ae73762eafb..0ded176f46ffef6a291a13cedc342cc01653a80e 100644 (file)
--- a/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/CmsWebSocketConfigurator.java
+++ b/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/CmsWebSocketConfigurator.java
@@ -27,11 +27,11 @@ import org.argeo.cms.servlet.CmsServletContext;
  * the initialisation of a new web socket.
  */
 public class CmsWebSocketConfigurator extends Configurator {
-       public final static String WEBSOCKET_SUBJECT = "org.argeo.cms.websocket.subject";
-       public final static String REMOTE_USER = "org.osgi.service.http.authentication.remote.user";
+//     public final static String WEBSOCKET_SUBJECT = "org.argeo.cms.websocket.subject";
+//     public final static String REMOTE_USER = "org.osgi.service.http.authentication.remote.user";
 
        private final static CmsLog log = CmsLog.getLog(CmsWebSocketConfigurator.class);
-       final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
+//     final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
 
        @Override
        public boolean checkOrigin(String originHeaderValue) {
@@ -98,8 +98,10 @@ public class CmsWebSocketConfigurator extends Configurator {
                        } else {
                                lc = RemoteAuthUtils.anonymousLogin(remoteAuthRequest, remoteAuthResponse);
                        }
-                       if (lc == null)
+                       if (lc == null) {
                                rejectResponse(response, e);
+                               return;
+                       }
                } finally {
                        Thread.currentThread().setContextClassLoader(currentThreadContextClassLoader);
                }