Merge pull request #1741 from Artur-/patch-1

Support versions of type 2.2.3.qualifier
Atmosphere · Oct 19, 2014 · 4f4c774 · 4f4c774
2 parents 8136a30 + 92354e2
commit 4f4c774
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/interceptor/JavaScriptProtocol.java b/modules/cpr/src/main/java/org/atmosphere/interceptor/JavaScriptProtocol.java
@@ -88,7 +88,7 @@ public Action inspect(final AtmosphereResource ar) {
 
             if (enforceAtmosphereVersion) {
                 String javascriptVersion = request.getHeader(HeaderConfig.X_ATMOSPHERE_FRAMEWORK);
-                int version = Integer.valueOf(javascriptVersion.split("-")[0].replace(".", ""));
+                int version = parseVersion(javascriptVersion.split("-")[0]);
                 if (version < 221) {
                     logger.error("Invalid Atmosphere Version {}", javascriptVersion);
                     response.setStatus(501);
@@ -170,6 +170,12 @@ public void onSuspend(AtmosphereResourceEvent event) {
         return Action.CONTINUE;
     }
 
+    private static int parseVersion(String version) {
+        // Remove any qualifier if the version is 1.2.3.qualifier
+        String[] parts = version.split("\\.");
+        return Integer.valueOf(parts[0] + parts[1] + parts[2]);
+    }
+
     public String wsDelimiter() {
         return wsDelimiter;
     }
@@ -192,4 +198,4 @@ public JavaScriptProtocol enforceAtmosphereVersion(boolean enforceAtmosphereVers
     public String toString() {
         return "Atmosphere JavaScript Protocol";
     }
-}
+}