cxf-commits mailing list archives

Repository: cxf
Updated Branches:
  refs/heads/master 6bdc9257b -> 6168d90fa


Fix to last merge


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

Branch: refs/heads/master
Commit: 6168d90fab71f2a8811640bfbbf88bfd1eed1848
Parents: 6bdc925
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Sun Mar 15 20:15:41 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Sun Mar 15 20:15:58 2015 +0000

----------------------------------------------------------------------
 .../apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/6168d90f/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
index f4d6e65..97a96ce 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
@@ -232,7 +232,7 @@ public abstract class AbstractWSS4JStaxInterceptor implements SoapInterceptor,
         }
         
         if (callbackHandler != null) {
-            securityProperties.setCallbackHandler((CallbackHandler)o);
+            securityProperties.setCallbackHandler(callbackHandler);
         }
     }