You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/11/02 19:34:39 UTC
[7/8] cxf git commit: Fixing merge II
Fixing merge II
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5a9707bb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5a9707bb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5a9707bb
Branch: refs/heads/3.0.x-fixes
Commit: 5a9707bbea984f3d8d39a3b5335406c43507ac91
Parents: 1acaf56
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 2 17:59:33 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 2 17:59:33 2015 +0000
----------------------------------------------------------------------
.../org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5a9707bb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
index 789c388..ed90380 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
@@ -348,17 +348,11 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
SecurityConstants.AUDIENCE_RESTRICTION_VALIDATION,
true);
if (enableAudienceRestriction) {
-<<<<<<< HEAD
List<String> audiences = new ArrayList<String>();
- if (msg.getContextualProperty(org.apache.cxf.message.Message.REQUEST_URL) != null) {
- audiences.add((String)msg.getContextualProperty(org.apache.cxf.message.Message.REQUEST_URL));
-=======
- List<String> audiences = new ArrayList<>();
if (msg.get(org.apache.cxf.message.Message.REQUEST_URL) != null) {
- audiences.add((String)msg.get(org.apache.cxf.message.Message.REQUEST_URL));
+ audiences.add((String)msg.getContextualProperty(org.apache.cxf.message.Message.REQUEST_URL));
} else if (msg.get(org.apache.cxf.message.Message.REQUEST_URI) != null) {
audiences.add((String)msg.get(org.apache.cxf.message.Message.REQUEST_URL));
->>>>>>> 0c0b31f... Don't use getContextualProperty to get the REQUEST_URL. Fallback to REQUEST_URI if it's not set
}
if (msg.getContextualProperty("javax.xml.ws.wsdl.service") != null) {