Return-Path: 
 <commits-return-15054-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 97DE06B89
	for <apmail-cxf-commits-archive@www.apache.org>;
 Thu, 16 Jun 2011 11:50:08 +0000 (UTC)
Received: (qmail 80398 invoked by uid 500); 16 Jun 2011 11:50:08 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 80359 invoked by uid 500); 16 Jun 2011 11:50:08 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 80352 invoked by uid 99); 16 Jun 2011 11:50:08 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jun 2011 11:50:08 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jun 2011 11:50:06 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 400BA2388A3D; Thu, 16 Jun 2011 11:49:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1136384 - in /cxf/branches/2.4.x-fixes: ./
 rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
Date: Thu, 16 Jun 2011 11:49:45 -0000
To: commits@cxf.apache.org
From: ningjiang@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110616114945.400BA2388A3D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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) {