Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 47c76c47b -> 66604a8e1


Preventing an unexpected NPE in AbstractHttpDestination in the MTOM test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/66604a8e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/66604a8e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/66604a8e

Branch: refs/heads/2.7.x-fixes
Commit: 66604a8e17609d3f858d0cd461d4a29e84f35f4b
Parents: 47c76c4
Author: Sergey Beryozkin <[email protected]>
Authored: Thu Apr 30 10:48:06 2015 +0100
Committer: Sergey Beryozkin <[email protected]>
Committed: Thu Apr 30 10:49:54 2015 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/transport/http/AbstractHTTPDestination.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/66604a8e/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
----------------------------------------------------------------------
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index ea35362..53b6674 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -655,7 +655,9 @@ public abstract class AbstractHTTPDestination
     }
 
     private boolean isResponseRedirected(Message outMessage) {
-        return 
Boolean.TRUE.equals(outMessage.getExchange().get(REQUEST_REDIRECTED));
+        Exchange exchange = outMessage.getExchange();
+        return exchange != null 
+               && Boolean.TRUE.equals(exchange.get(REQUEST_REDIRECTED));
     }
 
     /**

Reply via email to