cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [8/8] cxf git commit: Fixing merges
Date Mon, 02 Nov 2015 18:34:40 GMT
Fixing merges


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

Branch: refs/heads/3.0.x-fixes
Commit: 50934166743bed1b1aade6e4baca4405fb544faf
Parents: 5a9707b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Nov 2 18:34:24 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Nov 2 18:34:24 2015 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java    | 3 +++
 .../org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/50934166/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
index 5a52b0e..d5ac7bd 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
@@ -330,6 +330,9 @@ public final class WSS4JUtils {
         } else if (o instanceof URL) {
             return (URL)o;        
         }
+        
+        return null;
+    }
 
     public static PasswordEncryptor getPasswordEncryptor(Message message) {
         if (message == null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/50934166/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
index 6db3729..f5a3b47 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
@@ -128,7 +128,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase
{
         
         ConditionsBean conditions = new ConditionsBean();
         conditions.setTokenPeriodMinutes(5);
-        List<String> audiences = new ArrayList<>();
+        List<String> audiences = new ArrayList<String>();
         audiences.add("http://apache.org/one");
         AudienceRestrictionBean audienceRestrictionBean = new AudienceRestrictionBean();
         audienceRestrictionBean.setAudienceURIs(audiences);


Mime
View raw message