Author: dkulp
Date: Tue Feb 14 18:40:04 2012
New Revision: 1244155

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

........
  r1243445 | cschneider | 2012-02-13 04:00:25 -0500 (Mon, 13 Feb 2012) | 1 line
  
  Trying to fix build problem on IBM JDK
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java

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

Modified: 
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java?rev=1244155&r1=1244154&r2=1244155&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
 Tue Feb 14 18:40:04 2012
@@ -420,7 +420,9 @@ public class StructureImpl extends DataO
             return;
         case TEXTS:
             getTexts().clear();
-            getTexts().addAll((Collection)newValue);
+            Collection col = (Collection)newValue;
+            List textsList = getTexts();
+            textsList.addAll(col);
             return;
         }
         super.set(propertyIndex, newValue);


Reply via email to