Author: alessio.soldano(a)jboss.com
Date: 2009-06-30 10:36:43 -0400 (Tue, 30 Jun 2009)
New Revision: 10266
Modified:
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/NettyClient.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/WSResponseHandler.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java
Log:
Fix
Modified:
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/NettyClient.java
===================================================================
---
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/NettyClient.java 2009-06-30
14:28:21 UTC (rev 10265)
+++
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/NettyClient.java 2009-06-30
14:36:43 UTC (rev 10266)
@@ -68,6 +68,9 @@
*/
public class NettyClient
{
+ public static final String RESPONSE_CODE = "ResponseCode";
+ public static final String RESPONSE_CODE_MESSAGE = "ResponseCodeMessage";
+
private Marshaller marshaller;
private UnMarshaller unmarshaller;
private Long timeout;
Modified:
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/WSResponseHandler.java
===================================================================
---
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/WSResponseHandler.java 2009-06-30
14:28:21 UTC (rev 10265)
+++
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/WSResponseHandler.java 2009-06-30
14:36:43 UTC (rev 10266)
@@ -62,9 +62,8 @@
reset();
HttpResponse response = (HttpResponse)e.getMessage();
- //TODO!! fix constants
- responseHeaders.put("ResponseCode", response.getStatus().getCode());
- responseHeaders.put("ResponseCodeMessage",
response.getStatus().getReasonPhrase());
+ responseHeaders.put(NettyClient.RESPONSE_CODE, response.getStatus().getCode());
+ responseHeaders.put(NettyClient.RESPONSE_CODE_MESSAGE,
response.getStatus().getReasonPhrase());
for (String headerName : response.getHeaderNames())
{
responseHeaders.put(headerName, response.getHeaders(headerName));
Modified:
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
===================================================================
---
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2009-06-30
14:28:21 UTC (rev 10265)
+++
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2009-06-30
14:36:43 UTC (rev 10266)
@@ -34,6 +34,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.client.NettyClient;
import org.jboss.ws.core.client.UnMarshaller;
/**
@@ -62,8 +63,7 @@
try
{
- //TODO!!!! fix constants
- Integer resCode = (Integer)metadata.get("ResponseCode");
+ Integer resCode = (Integer)metadata.get(NettyClient.RESPONSE_CODE);
if (resCode == null)
{
log.warn("No HTTP resonse code, assuming: SC_OK");
Modified:
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java
===================================================================
---
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2009-06-30
14:28:21 UTC (rev 10265)
+++
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2009-06-30
14:36:43 UTC (rev 10266)
@@ -33,7 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import org.jboss.logging.Logger;
-import org.jboss.remoting.transport.http.HTTPMetadataConstants;
+import org.jboss.ws.core.client.NettyClient;
import org.jboss.ws.extensions.wsrm.api.RMException;
import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig;
@@ -124,7 +124,7 @@
Map<String, Object> remotingCtx =
result.getResponse().getMetadata().getContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT);
if (remotingCtx != null)
{
- if
(Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR).equals(remotingCtx.get(HTTPMetadataConstants.RESPONSE_CODE)))
+ if
(Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR).equals(remotingCtx.get(NettyClient.RESPONSE_CODE)))
{
logger.debug("Response message received in " +
(endTime - startTime) + " miliseconds, but contains internal server code, going to
resend the request message");
continue;
Show replies by date