You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/04/29 21:20:18 UTC

svn commit: r1477281 - /cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosUtils.java

Author: dkulp
Date: Mon Apr 29 19:20:14 2013
New Revision: 1477281

URL: http://svn.apache.org/r1477281
Log:
Merged revisions 1475914 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1475914 | dkulp | 2013-04-25 15:23:29 -0400 (Thu, 25 Apr 2013) | 18 lines

  Merged revisions 1475895 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ........
    r1475895 | dkulp | 2013-04-25 14:44:10 -0400 (Thu, 25 Apr 2013) | 10 lines

    Merged revisions 1475849 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1475849 | dkulp | 2013-04-25 12:46:41 -0400 (Thu, 25 Apr 2013) | 2 lines

      Don't use deprecated constructor

    ........

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosUtils.java

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosUtils.java?rev=1477281&r1=1477280&r2=1477281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosUtils.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosUtils.java Mon Apr 29 19:20:14 2013
@@ -19,7 +19,6 @@
 
 package org.apache.cxf.ws.security.kerberos;
 
-import org.apache.cxf.Bus;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.ws.security.SecurityConstants;
 
@@ -41,7 +40,7 @@ public final class KerberosUtils {
         KerberosClient client = (KerberosClient)message
             .getContextualProperty(SecurityConstants.KERBEROS_CLIENT);
         if (client == null) {
-            client = new KerberosClient(message.getExchange().get(Bus.class));
+            client = new KerberosClient();
         }
         return client;
     }