svn commit: r536939 - in /incubator/cxf/trunk: rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/

[dkulp]

Author: dkulp
Date: Thu May 10 09:57:52 2007
New Revision: 536939

URL: http://svn.apache.org/viewvc?view=rev&rev=536939
Log:
Fix for wrapper customization not working, fix for ArrayIndexOutOfBounds 
exception in header writing

Modified:
    
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
    
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java

Modified: 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java?view=diff&rev=536939&r1=536938&r2=536939
==============================================================================
--- 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
 (original)
+++ 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
 Thu May 10 09:57:52 2007
@@ -20,6 +20,7 @@
 package org.apache.cxf.binding.soap.interceptor;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.ResourceBundle;
 
@@ -129,6 +130,7 @@
             
                         
             
+            List<Object> objsToRemove = new ArrayList<Object>(headers.size());
             for (SoapHeaderInfo header : headers) {
                 MessagePartInfo part = header.getPart();
 
@@ -150,7 +152,10 @@
                 DataWriter<XMLStreamWriter> dataWriter = 
getDataWriter(message);
                 dataWriter.write(arg, header.getPart(), xtw);
                 
-                objs.remove(arg);
+                objsToRemove.add(arg);
+            }
+            for (Object obj : objsToRemove) {
+                objs.remove(obj);
             }
             
             

Modified: 
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?view=diff&rev=536939&r1=536938&r2=536939
==============================================================================
--- 
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
 (original)
+++ 
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
 Thu May 10 09:57:52 2007
@@ -329,10 +329,15 @@
                 
                 JAXWSBinding opBinding = 
(JAXWSBinding)opinfo.getExtensor(JAXWSBinding.class);
                 
-                if (opBinding != null && !opBinding.isEnableWrapperStyle()) {
-                    jaxwsBinding.setEnableWrapperStyle(false);
-                    if (!opBinding.isEnableAsyncMapping()) {
-                        jaxwsBinding.setEnableAsyncMapping(false);
+                
+                if (opBinding != null) {
+                    if (opBinding.isEnableWrapperStyle()) {
+                        jaxwsBinding.setEnableWrapperStyle(true);
+                    } else {
+                        jaxwsBinding.setEnableWrapperStyle(false);
+                        if (!opBinding.isEnableAsyncMapping()) {
+                            jaxwsBinding.setEnableAsyncMapping(false);
+                        }
                     }
                 }