You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by il...@apache.org on 2016/04/04 12:58:23 UTC
[1/2] cxf git commit: [CXF-6845] Partially reverting the change in
MessageUtils#isOutbound due to test failures
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ff8b78ea9 -> b20a66cc3
refs/heads/3.1.x-fixes f7641bc29 -> 82fba2c5f
[CXF-6845] Partially reverting the change in MessageUtils#isOutbound due to test failures
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/82fba2c5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/82fba2c5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/82fba2c5
Branch: refs/heads/3.1.x-fixes
Commit: 82fba2c5f2ec13773397b823127d29856dea174d
Parents: f7641bc
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Apr 4 12:57:42 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Apr 4 12:57:42 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/cxf/message/MessageUtils.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/82fba2c5/core/src/main/java/org/apache/cxf/message/MessageUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/MessageUtils.java b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
index b7f8137..5bcfe23 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageUtils.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
@@ -42,10 +42,13 @@ public final class MessageUtils {
* @return true if the message direction is outbound
*/
public static boolean isOutbound(Message message) {
- return message != null
- && message.getExchange() != null
- && (message == message.getExchange().getOutMessage()
- || message == message.getExchange().getOutFaultMessage());
+ if (message == null) {
+ return false;
+ }
+
+ Exchange exchange = message.getExchange();
+ return exchange != null
+ && (message == exchange.getOutMessage() || message == exchange.getOutFaultMessage());
}
/**
[2/2] cxf git commit: [CXF-6845] Partially reverting the change in
MessageUtils#isOutbound due to test failures
Posted by il...@apache.org.
[CXF-6845] Partially reverting the change in MessageUtils#isOutbound due to test failures
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b20a66cc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b20a66cc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b20a66cc
Branch: refs/heads/3.0.x-fixes
Commit: b20a66cc33837ad52535cf11778dd3f81825dc84
Parents: ff8b78e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Apr 4 12:58:09 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Apr 4 12:58:09 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/cxf/message/MessageUtils.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b20a66cc/core/src/main/java/org/apache/cxf/message/MessageUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/MessageUtils.java b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
index b7f8137..5bcfe23 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageUtils.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
@@ -42,10 +42,13 @@ public final class MessageUtils {
* @return true if the message direction is outbound
*/
public static boolean isOutbound(Message message) {
- return message != null
- && message.getExchange() != null
- && (message == message.getExchange().getOutMessage()
- || message == message.getExchange().getOutFaultMessage());
+ if (message == null) {
+ return false;
+ }
+
+ Exchange exchange = message.getExchange();
+ return exchange != null
+ && (message == exchange.getOutMessage() || message == exchange.getOutFaultMessage());
}
/**