[4/8] cxf git commit: Don't use getContextualProperty to get the REQUEST_URL. Fallback to REQUEST_URI if it's not set

[coheigea]

Don't use getContextualProperty to get the REQUEST_URL. Fallback to REQUEST_URI 
if it's not set

Conflicts:
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java


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

Branch: refs/heads/3.0.x-fixes
Commit: 2b3da927d54f8057adac1e01e353500b2bd48d37
Parents: 0d8398d
Author: Colm O hEigeartaigh <cohei...@apache.org>
Authored: Mon Nov 2 17:15:58 2015 +0000
Committer: Colm O hEigeartaigh <cohei...@apache.org>
Committed: Mon Nov 2 17:58:58 2015 +0000

----------------------------------------------------------------------
 .../apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java    | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/2b3da927/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 c0cd6f0..789c388 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,10 +348,19 @@ 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));
+            } 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) {
                 
audiences.add(msg.getContextualProperty("javax.xml.ws.wsdl.service").toString());
             }