Author: sergeyb Date: 2010-09-23 07:07:03 -0400 (Thu, 23 Sep 2010) New Revision: 13015 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMRequestHandlerImpl.java Log: [JBWS-3116] : Fixing WSRM test regressions and updating NettyClient to have Host header including the port if specified Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2010-09-23 10:37:46 UTC (rev 13014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2010-09-23 11:07:03 UTC (rev 13015) @@ -177,7 +177,7 @@ String targetRequestUri = isProxyRequest(additionalHeaders) ? targetAddress : getRelativeRequestUri(target); HttpRequest request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, reqMessage != null ? HttpMethod.POST : HttpMethod.GET, targetRequestUri); - request.addHeader(HttpHeaders.Names.HOST, target.getHost()); + request.addHeader(HttpHeaders.Names.HOST, target.getAuthority()); request.addHeader(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE); setAdditionalHeaders(request, additionalHeaders); setActualChunkedLength(request, callProps); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMRequestHandlerImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMRequestHandlerImpl.java 2010-09-23 10:37:46 UTC (rev 13014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMRequestHandlerImpl.java 2010-09-23 11:07:03 UTC (rev 13015) @@ -21,7 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.transport.backchannel; -import java.net.URL; +import java.net.URI; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -77,7 +77,8 @@ boolean error = false; try { - String requestPath = new URL(request.getUri()).getPath(); + URI requestURI = URI.create(request.getUri()); + String requestPath = requestURI.getRawPath(); RMMessage message = (RMMessage)RMUnMarshaller.getInstance().read(content.readable() ? new ChannelBufferInputStream(content) : null, null, requestHeaders); handle(requestPath, message); }