svn commit: r1393575 - in /cxf/branches/2.6.x-fixes: api/src/main/java/org/apache/cxf/staxutils/transform/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/ tool...

[co...@apache.org]

Author: coheigea
Date: Wed Oct  3 16:05:52 2012
New Revision: 1393575

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

Modified:
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
    cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java
    cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
    cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java?rev=1393575&r1=1393574&r2=1393575&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java Wed Oct  3 16:05:52 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.6.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.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java?rev=1393575&r1=1393574&r2=1393575&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java Wed Oct  3 16:05:52 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;
                     }

Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=1393575&r1=1393574&r2=1393575&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java Wed Oct  3 16:05:52 2012
@@ -431,6 +431,10 @@ public class IssuedTokenInterceptorProvi
                     mapSecurityProps(message, ctx);
                 
                     client.setMessage(message);
+
+                    if (maps != null) {
+                        client.setAddressingNamespace(maps.getNamespaceURI());
+                    }
                     
                     client.setTrust(getTrust10(aim));
                     client.setTrust(getTrust13(aim));

Modified: cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java?rev=1393575&r1=1393574&r2=1393575&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java (original)
+++ cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java Wed Oct  3 16:05:52 2012
@@ -49,14 +49,14 @@ public class ToolErrorListener {
     List<ErrorInfo> errors = new LinkedList<ErrorInfo>();
     
     public void addError(String file, int line, int column, String message) {
-        addError(file, line, column, null);
+        addError(file, line, column, null, null);
     }
     public void addError(String file, int line, int column, String message, Throwable t) {
         errors.add(new ErrorInfo(file, line, column, message, t));
     }
 
     public void addWarning(String file, int line, int column, String message) {
-        addWarning(file, line, column, null);
+        addWarning(file, line, column, null, null);
     }
     public void addWarning(String file, int line, int column, String message, Throwable t) {
         if (file != null) {