[jbossws-commits] JBossWS SVN: r2884 - branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core.

[jbossws-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2007-04-17 14:08:35 -0400 (Tue, 17 Apr 2007)
New Revision: 2884

Modified:
   branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
Log:
JBWS-1610 - Fixed regression with XOPHandlerTestCase

Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java	2007-04-17 17:57:09 UTC (rev 2883)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java	2007-04-17 18:08:35 UTC (rev 2884)
@@ -29,8 +29,10 @@
 
 import javax.xml.soap.SOAPMessage;
 
+import org.jboss.logging.Logger;
 import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
 import org.jboss.ws.core.server.MessageContextPropertyHelper;
+import org.jboss.ws.extensions.xop.XOPContext;
 import org.jboss.ws.metadata.umdm.EndpointMetaData;
 import org.jboss.ws.metadata.umdm.OperationMetaData;
 import org.jboss.xb.binding.NamespaceRegistry;
@@ -43,6 +45,8 @@
  */
 public abstract class CommonMessageContext
 {
+   private static Logger log = Logger.getLogger(CommonMessageContext.class);
+
    // expandToDOM in the SOAPContentElement should not happen during normal operation 
    // This property should be set the message context when it is ok to do so.
    public static String ALLOW_EXPAND_TO_DOM = "org.jboss.ws.allow.expand.dom";
@@ -172,6 +176,13 @@
 
    public boolean isModified()
    {
+      // skip changes from XOP handler interactions
+      if (XOPContext.isXOPEncodedRequest() && !XOPContext.isXOPMessage())
+      {
+         log.debug("Disregard changes from XOP/Handler interactions");
+         return false;
+      }
+
       return isModified;
    }