Merge pull request #714 from sbalmos/master

Fix for #707 webSocketUrl Jersey dispatching
Atmosphere · Oct 26, 2012 · b85f9ec · b85f9ec
2 parents f42c4b3 + fa55bd6
commit b85f9ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/websocket/protocol/SimpleHttpProtocol.java b/modules/cpr/src/main/java/org/atmosphere/websocket/protocol/SimpleHttpProtocol.java
@@ -93,12 +93,14 @@ public List<AtmosphereRequest> onMessage(WebSocket webSocket, String d) {
             return null;
         }
         String pathInfo = resource.getRequest().getPathInfo();
+        String requestURI = resource.getRequest().getRequestURI();
 
         if (d.startsWith(delimiter)) {
             int delimiterLength = delimiter.length();
             int bodyBeginIndex = d.indexOf(delimiter, delimiterLength);
             if (bodyBeginIndex != -1) {
                 pathInfo = d.substring(delimiterLength, bodyBeginIndex);
+                requestURI += pathInfo;
                 d = d.substring(bodyBeginIndex + delimiterLength);
             }
         }
@@ -118,6 +120,7 @@ public List<AtmosphereRequest> onMessage(WebSocket webSocket, String d) {
                 .body(d)
                 .attributes(m)
                 .pathInfo(pathInfo)
+                .requestURI(requestURI)
                 .destroyable(destroyable)
                 .headers(resource.getRequest().headersMap())
                 .session(resource.session())

diff --git a/modules/jquery/src/main/webapp/jquery/jquery.atmosphere.js b/modules/jquery/src/main/webapp/jquery/jquery.atmosphere.js
@@ -2221,6 +2221,8 @@ jQuery.atmosphere = function() {
                 _intraPush(message);
             };
 
+            this.request = _request;
+
             this.response = _response;
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -2221,6 +2221,8 @@ jQuery.atmosphere = function() { @@
                     _intraPush(message);
                 };
+                this.request = _request;
                 this.response = _response;
             },
@@ Expand Down @@