cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1136387 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
Date Thu, 16 Jun 2011 11:56:54 GMT
Author: ningjiang
Date: Thu Jun 16 11:56:53 2011
New Revision: 1136387

URL: http://svn.apache.org/viewvc?rev=1136387&view=rev
Log:
Merged revisions 1136384 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1136384 | ningjiang | 2011-06-16 19:49:44 +0800 (Thu, 16 Jun 2011) | 9 lines
  
  Merged revisions 1136380 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1136380 | ningjiang | 2011-06-16 19:31:06 +0800 (Thu, 16 Jun 2011) | 1 line
    
    CXF-3572 do some enhancement on the HolderOutInterceptor
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 11:56:53 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1135488,1135908,1135911,1136274,1136285
-/cxf/trunk:1135484,1135899
+/cxf/branches/2.4.x-fixes:1135488,1135908,1135911,1136274,1136285,1136384
+/cxf/trunk:1135484,1135899,1136380

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java?rev=1136387&r1=1136386&r2=1136387&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
Thu Jun 16 11:56:53 2011
@@ -72,7 +72,7 @@ public class HolderOutInterceptor extend
             List<MessagePartInfo> parts = op.getOutput().getMessageParts();
             MessageContentsList inObjects = MessageContentsList.getContentsList(exchange.getInMessage());
             if (inObjects != null) {
-                if (!inObjects.equals(outObjects)) {
+                if (!(inObjects == outObjects)) {
                     for (int x = 0; x < inObjects.size(); x++) {
                         Object o = inObjects.get(x);
                         if (o instanceof Holder) {
@@ -81,6 +81,7 @@ public class HolderOutInterceptor extend
                     }
                 } else {
                     LOG.severe("CANNOT_SET_HOLDER_OBJECTS");
+                    throw new Fault(new org.apache.cxf.common.i18n.Message("CANNOT_SET_HOLDER_OBJECTS",
LOG));
                 }
             }
             for (MessagePartInfo part : parts) {



Mime
View raw message