### Eclipse Workspace Patch 1.0 #P httpclient Index: src/main/java/org/apache/http/impl/auth/NegotiateScheme.java =================================================================== --- src/main/java/org/apache/http/impl/auth/NegotiateScheme.java (revision 943129) +++ src/main/java/org/apache/http/impl/auth/NegotiateScheme.java (working copy) @@ -128,6 +128,10 @@ return authenticate(credentials, request, null); } + protected GSSManager getManager() { + return GSSManager.getInstance(); + } + /** * Produces Negotiate authorization Header based on token created by * processChallenge. @@ -193,7 +197,7 @@ boolean tryKerberos = false; try { - GSSManager manager = GSSManager.getInstance(); + GSSManager manager = getManager(); GSSName serverName = manager.createName("HTTP/" + authServer, null); gssContext = manager.createContext( serverName.canonicalize(negotiationOid), negotiationOid, null, @@ -215,7 +219,7 @@ /* Kerberos v5 GSS-API mechanism defined in RFC 1964.*/ log.debug("Using Kerberos MECH " + KERBEROS_OID); negotiationOid = new Oid(KERBEROS_OID); - GSSManager manager = GSSManager.getInstance(); + GSSManager manager = getManager(); GSSName serverName = manager.createName("HTTP/" + authServer, null); gssContext = manager.createContext( serverName.canonicalize(negotiationOid), negotiationOid, null, @@ -261,7 +265,7 @@ throw new AuthenticationException(ex.getMessage()); } return new BasicHeader("Authorization", "Negotiate " + - new String(new Base64().encode(token)) ); + new String(Base64.encodeBase64(token, false)) ); }