cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1163787 - in /cxf/branches/2.4.x-fixes: ./ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
Date Wed, 31 Aug 2011 20:16:24 GMT
Author: dkulp
Date: Wed Aug 31 20:16:24 2011
New Revision: 1163787

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

........
  r1163786 | dkulp | 2011-08-31 16:15:18 -0400 (Wed, 31 Aug 2011) | 3 lines
  
  [CXF-2952] When reading a bound sequence, stop reading once the last one
  is read off the wire and truncate the list/array down to the number
  actually sent.
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
    cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java

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

Modified: cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java?rev=1163787&r1=1163786&r2=1163787&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
Wed Aug 31 20:16:24 2011
@@ -551,6 +551,7 @@ public class CorbaObjectReader {
                 for (int i = 0; i < length; ++i) {
                     read(seqElements.get(i));
                 }
+                sequenceObj.setElements(seqElements.subList(0, length));
             }
         }
     }

Modified: cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java?rev=1163787&r1=1163786&r2=1163787&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
Wed Aug 31 20:16:24 2011
@@ -42,7 +42,11 @@ public class CorbaPrimitiveTypeEventProd
     }
 
     public String getText() {
-        return handler.getDataFromValue();
+        String s = handler.getDataFromValue();
+        if (s == null) {
+            return "";
+        }
+        return s;
     }
 
     public int next() {



Mime
View raw message