svn commit: r594310 - /incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java

[dk...@apache.org]

Author: dkulp
Date: Mon Nov 12 13:54:23 2007
New Revision: 594310

URL: http://svn.apache.org/viewvc?rev=594310&view=rev
Log:
Merged revisions 594262 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r594262 | dkulp | 2007-11-12 14:18:23 -0500 (Mon, 12 Nov 2007) | 4 lines
  
  [CXF-1202] Fix issue with in/out out of band headers
  move FixedExtensionDeserializer hack into xmlschema package with the other hacks
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java?rev=594310&r1=594309&r2=594310&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java Mon Nov 12 13:54:23 2007
@@ -21,6 +21,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.ws.Holder;
@@ -50,11 +51,13 @@
         Exchange exchange = message.getExchange();
         OperationInfo op = exchange.get(OperationInfo.class);
         
-        LOG.fine("op: " + op);
-        if (null != op) {
-            LOG.fine("op.hasOutput(): " + op.hasOutput());
-            if (op.hasOutput()) {
-                LOG.fine("op.getOutput().size(): " + op.getOutput().size());
+        if (LOG.isLoggable(Level.FINE)) {
+            LOG.fine("op: " + op);
+            if (null != op) {
+                LOG.fine("op.hasOutput(): " + op.hasOutput());
+                if (op.hasOutput()) {
+                    LOG.fine("op.getOutput().size(): " + op.getOutput().size());
+                }
             }
         }
 
@@ -81,21 +84,16 @@
                 }
             }
         } else {
-            List<MessagePartInfo> parts = op.getOutput().getMessageParts();
             List<Object> holders = new ArrayList<Object>(outObjects);
             for (int x = 0; x < outObjects.size(); x++) {
                 Object o = outObjects.get(x);
-                if (!(o instanceof Holder)) {
+                if (o instanceof Holder) {
+                    outObjects.set(x, ((Holder)o).value);
+                } else {
                     holders.set(x, null);
                 }
             }
             message.put(HolderInInterceptor.CLIENT_HOLDERS, holders);
-            for (MessagePartInfo part : parts) {
-                if (part.getIndex() > 0) {
-                    Holder holder = (Holder)outObjects.get(part.getIndex() - 1);
-                    outObjects.set(part.getIndex() - 1, holder.value);
-                }
-            }
         }
         
     }