From bc951030bae453d1773914b6fbff33f23be5d09b Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 17 Jan 2019 12:27:42 +1100
Subject: [PATCH] cleanup the isEnabledViaContext check in JavaxWebSocket SCI

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 ...xWebSocketServletContainerInitializer.java | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServletContainerInitializer.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServletContainerInitializer.java
index b3fdf6ef028..70589fa2f16 100644
--- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServletContainerInitializer.java
+++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServletContainerInitializer.java
@@ -54,46 +54,31 @@ public class JavaxWebSocketServletContainerInitializer implements ServletContain
      *
      * @param context  the context to search
      * @param keyName  the key name
-     * @param defValue the default value, if the value is not specified in the context
-     * @return the value for the feature key
+     * @return the value for the feature key, otherwise null if key is not set in context
      */
-    public static Boolean isEnabledViaContext(ServletContext context, String keyName, Boolean defValue)
+    private static Boolean isEnabledViaContext(ServletContext context, String keyName)
     {
         // Try context parameters first
         String cp = context.getInitParameter(keyName);
-
         if (cp != null)
         {
             if (TypeUtil.isTrue(cp))
-            {
                 return true;
-            }
-
-            if (TypeUtil.isFalse(cp))
-            {
+            else
                 return false;
-            }
-
-            return defValue;
         }
 
         // Next, try attribute on context
         Object enable = context.getAttribute(keyName);
-
         if (enable != null)
         {
             if (TypeUtil.isTrue(enable))
-            {
                 return true;
-            }
-
-            if (TypeUtil.isFalse(enable))
-            {
+            else
                 return false;
-            }
         }
 
-        return defValue;
+        return null;
     }
 
     public static JavaxWebSocketServerContainer configureContext(ServletContextHandler context)
@@ -110,13 +95,18 @@ public class JavaxWebSocketServletContainerInitializer implements ServletContain
     @Override
     public void onStartup(Set<Class<?>> c, ServletContext context) throws ServletException
     {
-        Boolean dft = isEnabledViaContext(context, DEPRECATED_ENABLE_KEY, null);
-        if (dft==null)
-            dft = Boolean.TRUE;
-        else
+        Boolean enableKey = isEnabledViaContext(context, ENABLE_KEY);
+        Boolean deprecatedEnabledKey = isEnabledViaContext(context, DEPRECATED_ENABLE_KEY);
+        if (deprecatedEnabledKey != null)
             LOG.warn("Deprecated parameter used: " + DEPRECATED_ENABLE_KEY);
 
-        if (!isEnabledViaContext(context, ENABLE_KEY, dft))
+        boolean websocketEnabled = true;
+        if (enableKey != null)
+            websocketEnabled = enableKey;
+        else if (deprecatedEnabledKey != null)
+            websocketEnabled = deprecatedEnabledKey;
+
+        if (!websocketEnabled)
         {
             LOG.info("Javax Websocket is disabled by configuration for context {}", context.getContextPath());
             return;