cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1393581 - in /cxf/branches/2.5.x-fixes: common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java
Date Wed, 03 Oct 2012 16:18:21 GMT
Author: coheigea
Date: Wed Oct  3 16:18:21 2012
New Revision: 1393581

URL: http://svn.apache.org/viewvc?rev=1393581&view=rev
Log:
Some selected fixes from code cleanup on trunk


Conflicts:

	rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
	tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java

Modified:
    cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
    cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java

Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java?rev=1393581&r1=1393580&r2=1393581&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
(original)
+++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
Wed Oct  3 16:18:21 2012
@@ -441,7 +441,7 @@ public class InTransformReader extends D
     }
 
     public char[] getTextCharacters() {
-        if (currentEvent != null && currentEvent != null) {
+        if (currentEvent != null && currentEvent.getValue() != null) {
             return currentEvent.getValue().toCharArray();
         }
         char[] superChars = super.getTextCharacters();
@@ -454,7 +454,7 @@ public class InTransformReader extends D
 
     public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length)

         throws XMLStreamException {
-        if (currentEvent != null && currentEvent != null) {
+        if (currentEvent != null && currentEvent.getValue() != null) {
             int len = currentEvent.getValue().length() - sourceStart;
             if (len > length) {
                 len = length;

Modified: cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java?rev=1393581&r1=1393580&r2=1393581&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java
Wed Oct  3 16:18:21 2012
@@ -257,6 +257,7 @@ public class SoapTcpOutputStream extends
                     try {
                         SoapTcpFrame frame = SoapTcpUtils.readMessageFrame(inStream);
                         baos.write(frame.getPayload());
+                        frameType = frame.getHeader().getFrameType();
                     } catch (IOException e) {
                         break;
                     }



Mime
View raw message