Author: jim.ma
Date: 2011-04-06 00:37:35 -0400 (Wed, 06 Apr 2011)
New Revision: 14011
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
Log:
[JBWS-3250]:Clean up swap file after response message is created
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-05
20:36:31 UTC (rev 14010)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-06
04:37:35 UTC (rev 14011)
@@ -85,7 +85,6 @@
public static CommonMessageContext processPivot(CommonMessageContext requestContext)
{
log.debug("Begin response processing");
- cleanupAttachments(requestContext);
return requestContext;
}
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-05
20:36:31 UTC (rev 14010)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-06
04:37:35 UTC (rev 14011)
@@ -231,8 +231,10 @@
HandlerType[] handlerType = new HandlerType[] { HandlerType.PRE,
HandlerType.ENDPOINT, HandlerType.POST };
HandlerType[] faultType = new HandlerType[] { HandlerType.PRE,
HandlerType.ENDPOINT, HandlerType.POST };
+
// Associate a message context with the current thread
CommonMessageContext msgContext = new SOAPMessageContextJAXWS();
+ CommonMessageContext reqMsgContext = msgContext;
MessageContextAssociation.pushMessageContext(msgContext);
try
{
@@ -302,6 +304,8 @@
}
finally
{
+ //cleanup attachment if there is any
+ CommonMessageContext.cleanupAttachments(reqMsgContext);
closeHandlerChain(portName, handlerType[2]);
closeHandlerChain(portName, handlerType[1]);
closeHandlerChain(portName, handlerType[0]);
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-05
20:36:31 UTC (rev 14010)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-06
04:37:35 UTC (rev 14011)
@@ -118,7 +118,6 @@
resContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY,
Boolean.valueOf(!outbound));
MessageContextAssociation.pushMessageContext(resContext);
- cleanupAttachments(reqContext);
return resContext;
}
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-05
20:36:31 UTC (rev 14010)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-06
04:37:35 UTC (rev 14011)
@@ -314,7 +314,7 @@
{
msgContext.setEndpointMetaData(sepMetaData);
MessageAbstraction resMessage = processRequest(endpoint, nettyMessage == null ?
headerSource : nettyMessage, invContext, inStream);
-
+ CommonMessageContext reqMsgContext = msgContext;
// Replace the message context with the response context
msgContext = MessageContextAssociation.peekMessageContext();
@@ -372,6 +372,7 @@
boolean isWsrmOneWay = isWsrmMessage &&
(Boolean)rmResCtx.get(RMConstant.ONE_WAY_OPERATION);
if ((outStream != null) && (isWsrmOneWay == false)) // RM hack
sendResponse(endpoint, outStream, isFault);
+ CommonMessageContext.cleanupAttachments(reqMsgContext);
}
catch (Exception ex)
{
Show replies by date