[jbossws-commits] JBossWS SVN: r14018 - in stack/native/branches/jbossws-native-3.1.2/modules/core: src/main/java/org/jboss/ws/core/jaxrpc/handler and 3 other directories.

Author: bmaxwell Date: 2011-04-07 01:02:25 -0400 (Thu, 07 Apr 2011) New Revision: 14018 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java Log: [JBPAPP-6267] Clean up swap file after response message is created Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/core ___________________________________________________________________ Added: svn:mergeinfo + /stack/native/trunk/modules/core:12502,13992,14011 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-06 17:10:02 UTC (rev 14017) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-07 05:02:25 UTC (rev 14018) @@ -85,7 +85,6 @@ public static CommonMessageContext processPivot(CommonMessageContext requestContext) { log.debug("Begin response processing"); - cleanupAttachments(requestContext); return requestContext; } Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-06 17:10:02 UTC (rev 14017) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-07 05:02:25 UTC (rev 14018) @@ -207,8 +207,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 { @@ -278,6 +280,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/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-06 17:10:02 UTC (rev 14017) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-07 05:02:25 UTC (rev 14018) @@ -118,7 +118,6 @@ resContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.valueOf(!outbound)); MessageContextAssociation.pushMessageContext(resContext); - cleanupAttachments(reqContext); return resContext; } Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-06 17:10:02 UTC (rev 14017) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-07 05:02:25 UTC (rev 14018) @@ -292,7 +292,7 @@ { msgContext.setEndpointMetaData(sepMetaData); MessageAbstraction resMessage = processRequest(endpoint, headerSource, invContext, inStream); - + CommonMessageContext reqMsgContext = msgContext; // Replace the message context with the response context msgContext = MessageContextAssociation.peekMessageContext(); @@ -325,6 +325,7 @@ } sendResponse(endpoint, outStream, isFault); + CommonMessageContext.cleanupAttachments(reqMsgContext); } catch (Exception ex) {