Author: ningjiang
Date: Thu Jun 16 11:49:44 2011
New Revision: 1136384
URL: http://svn.apache.org/viewvc?rev=1136384&view=rev
Log:
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.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 11:49:44 2011
@@ -1 +1 @@
-/cxf/trunk:1134248,1134281,1134523,1135484,1135899
+/cxf/trunk:1134248,1134281,1134523,1135484,1135899,1136380
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 16 11:49:44 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1135457,1135484,1135899
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1135457,1135484,1135899,1136380
Modified:
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java?rev=1136384&r1=1136383&r2=1136384&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
Thu Jun 16 11:49:44 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) {
