Merge branch 'master' into refactoring

jenkinsci · Aug 13, 2013 · ad63ef4 · ad63ef4
2 parents 1785d16 + 6a97955
commit ad63ef4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/hudson/scm/SubversionSCM.java b/src/main/java/hudson/scm/SubversionSCM.java
@@ -1678,9 +1678,11 @@ public SslClientCertificateCredential(File certificate, String password) throws
             public SVNAuthentication createSVNAuthentication(String kind) {
                 if(kind.equals(ISVNAuthenticationManager.SSL))
                     try {
-                        return new SVNSSLAuthentication(
+                        SVNSSLAuthentication authentication = new SVNSSLAuthentication(
                                 Base64.decode(certificate.getPlainText().toCharArray()),
-                                Scrambler.descramble(password),false);
+                                Scrambler.descramble(password), false);
+                        authentication.setCertificatePath("dummy"); // TODO: remove this JENKINS-19175 workaround
+                        return authentication;
                     } catch (IOException e) {
                         throw new Error(e); // can't happen
                     }