You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2018/07/18 19:46:28 UTC
[cxf] branch master updated: [CXF-7799] Extract queryString from
AtmosphereRequest path (#430)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 217f58c [CXF-7799] Extract queryString from AtmosphereRequest path (#430)
217f58c is described below
commit 217f58c5ebef1efcbe1cb8cb90dedb459f8fb27e
Author: Alexander Onnikov <Al...@gmail.com>
AuthorDate: Thu Jul 19 02:46:25 2018 +0700
[CXF-7799] Extract queryString from AtmosphereRequest path (#430)
Thanks, @aonnikov !
---
.../websocket/atmosphere/DefaultProtocolInterceptor.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index 3c6ffff..ae35901 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -269,6 +269,13 @@ public class DefaultProtocolInterceptor extends AtmosphereInterceptorAdapter {
throw new InvalidPathException();
}
+ String queryString = "";
+ int index = path.indexOf("?");
+ if (index != -1) {
+ queryString = path.substring(index + 1);
+ path = path.substring(0, index);
+ }
+
String requestURI = path;
String requestURL = r.getRequestURL() + requestURI.substring(r.getRequestURI().length());
String contentType = hdrs.get("Content-Type");
@@ -280,6 +287,7 @@ public class DefaultProtocolInterceptor extends AtmosphereInterceptorAdapter {
.method(method)
.requestURI(requestURI)
.requestURL(requestURL)
+ .queryString(queryString)
.request(r);
// add the body only if it is present
byte[] body = WebSocketUtils.readBody(in);