You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ws.apache.org by co...@apache.org on 2016/06/03 09:47:30 UTC

svn commit: r1746699 - /webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java

Author: coheigea
Date: Fri Jun  3 09:47:30 2016
New Revision: 1746699

URL: http://svn.apache.org/viewvc?rev=1746699&view=rev
Log:
[WSS-580] - ThreadLocalSecurityProvider returns null instead of empty collection.

Thanks to Domislavskiy Michael for the patch.

Modified:
    webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java

Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java?rev=1746699&r1=1746698&r2=1746699&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java Fri Jun  3 09:47:30 2016
@@ -182,7 +182,7 @@ public final class ThreadLocalSecurityPr
         if (p != null) {
             return p.getServices();
         } else {
-            return null;
+            return Collections.emptySet();
         }
     }