cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing backmerge
Date Tue, 26 Apr 2016 14:46:59 GMT
Fixing backmerge


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

Branch: refs/heads/3.0.x-fixes
Commit: 82591273ff0988104cc5fc9646f34043a50283c7
Parents: 3b182af
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Apr 26 15:46:42 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Apr 26 15:46:42 2016 +0100

----------------------------------------------------------------------
 .../security/wss4j/policyhandlers/AbstractBindingBuilder.java  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/82591273/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 9fd781f..ab2aa94 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -298,14 +298,10 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
             Map<Object, Crypto> o = 
                 CastUtils.cast((Map<?, ?>)message.getContextualProperty(CRYPTO_CACHE));
             if (o == null) {
-<<<<<<< HEAD
-                o = new ConcurrentHashMap<Object, Crypto>();
-=======
                 o = CastUtils.cast((Map<?, ?>)info.getProperty(CRYPTO_CACHE));
             }
             if (o == null) {
-                o = new ConcurrentHashMap<>();
->>>>>>> ea1b593... [CXF-6883] - Crypto caching issues in the WS-Security
code
+                o = new ConcurrentHashMap<Object, Crypto>();
                 info.setProperty(CRYPTO_CACHE, o);
             }
             return o;


Mime
View raw message