cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r573385 - in /incubator/cxf/trunk/rt: bindings/soap/src/main/java/org/apache/cxf/binding/soap/ frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/ frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/
Date Thu, 06 Sep 2007 21:26:59 GMT
Author: dkulp
Date: Thu Sep  6 14:26:59 2007
New Revision: 573385

URL: http://svn.apache.org/viewvc?rev=573385&view=rev
Log:
Fixes for outofband headers when using wrapper types

Modified:
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=573385&r1=573384&r2=573385&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
(original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Thu Sep  6 14:26:59 2007
@@ -222,6 +222,7 @@
                         soapHeader.setPart(headerInfo.getPart().getName().getLocalPart());
                         soapHeader.setUse("literal");
                         bodyParts.remove(headerInfo.getPart().getName().getLocalPart());
+                        headerInfo.getPart().setProperty(HEADER, true);
                         b.getInput().addExtensor(soapHeader);
                     }
                 }
@@ -449,6 +450,7 @@
                 pi.setXmlSchema(schemas.getElementByQName(part.getElementName()));
             }
             pi.setProperty(OUT_OF_BAND_HEADER, Boolean.TRUE);
+            pi.setProperty(HEADER, Boolean.TRUE);
         }
     }
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=573385&r1=573384&r2=573385&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
Thu Sep  6 14:26:59 2007
@@ -110,7 +110,12 @@
     }
 
     public final Object get(Object key) {
-        return contextMap.get(key);
+        Object ret = contextMap.get(key);
+        if (ret == null
+            && Message.class.getName().equals(key)) {
+            return message;
+        }
+        return ret;
     }
 
     public final boolean isEmpty() {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=573385&r1=573384&r2=573385&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
Thu Sep  6 14:26:59 2007
@@ -123,7 +123,7 @@
                 for (MessagePartInfo part : messageInfo.getMessageParts()) {
                     if (Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.HEADER)))
{
                         MessagePartInfo mpi = wrappedMessageInfo.getMessagePart(part.getName());
-                        newParams.put(mpi, lst.get(part));
+                        newParams.put(part, lst.get(mpi));
                     }
                 }
             } catch (Exception e) {



Mime
View raw message