[jbossws-commits] JBossWS SVN: r13538 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: ghjboss
Date: 2011-01-03 11:08:17 -0500 (Mon, 03 Jan 2011)
New Revision: 13538

Modified:
   stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
   stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java
Log:
[JBPAPP-5710] - port the changes in "[JBWS-3192] Set application/fastinfoset content-type on request messages when FastInfosetFeature is on"


Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java	2010-12-29 10:54:13 UTC (rev 13537)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java	2011-01-03 16:08:17 UTC (rev 13538)
@@ -59,6 +59,7 @@
 import org.jboss.ws.core.soap.attachment.MultipartRelatedSwAEncoder;
 import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder;
 import org.jboss.ws.extensions.xop.XOPContext;
+import org.jboss.ws.feature.FastInfosetFeature;
 import org.jboss.ws.metadata.umdm.EndpointMetaData;
 import org.jboss.ws.metadata.umdm.OperationMetaData;
 import org.w3c.dom.Node;
@@ -299,10 +300,9 @@
       return new MimeMatchingAttachmentsIterator(headers, attachments);
    }
    
-   private String getSOAPContentType() throws SOAPException
+   private String getSOAPContentType(CommonMessageContext msgContext) throws SOAPException
    {
       //Check binding type in the endpoint metadata
-      CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
       if (msgContext != null && Constants.SOAP12HTTP_BINDING.equalsIgnoreCase(msgContext.getEndpointMetaData().getBindingId()))
       {
          return SOAPConstants.SOAP_1_2_CONTENT_TYPE;
@@ -329,7 +329,8 @@
                throw new IllegalStateException("XOP parameter not properly inlined");
 
             // default content-type
-            String contentType = getSOAPContentType() + "; charset=" + getCharSetEncoding();
+            CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+            String contentType = getSOAPContentType(msgContext) + "; charset=" + getCharSetEncoding();
 
             if (hasAttachments)
             {
@@ -346,6 +347,10 @@
                   contentType = multipartRelatedEncoder.getContentType();
                }
             }
+            else if (msgContext != null && msgContext.getEndpointMetaData().getFeatures().isFeatureEnabled(FastInfosetFeature.class))
+            {
+               contentType = MimeConstants.TYPE_FASTINFOSET;
+            }
             //JBWS-2964:Create a new mimeHeaders to avoid changing another referenced mimeHeaders
             MimeHeaders newMimeHeaders = new MimeHeaders();
             Iterator iterator = mimeHeaders.getAllHeaders();

Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java	2010-12-29 10:54:13 UTC (rev 13537)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java	2011-01-03 16:08:17 UTC (rev 13538)
@@ -32,6 +32,7 @@
 
 import junit.framework.Test;
 
+import org.jboss.ws.core.soap.attachment.MimeConstants;
 import org.jboss.ws.feature.FastInfosetFeature;
 import org.jboss.wsf.common.DOMUtils;
 import org.jboss.wsf.test.JBossWSTest;
@@ -79,6 +80,7 @@
       
       int resCode = con.getResponseCode();
       assertEquals(200, resCode);
+      assertEquals(MimeConstants.TYPE_FASTINFOSET, con.getContentType());
    }
    
    public void testRoundTrip() throws Exception