[FIXED JENKINS-19175] Add workaround to new code path

jenkinsci · Aug 13, 2013 · 2a0ab93 · 2a0ab93
1 parent ad63ef4
commit 2a0ab93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/src/main/java/hudson/scm/CredentialsSVNAuthenticationProviderImpl.java b/src/main/java/hudson/scm/CredentialsSVNAuthenticationProviderImpl.java
@@ -309,8 +309,11 @@ public SVNCertificateAuthenticationBuilder(CertificateCredentials c) {
 
         public List<SVNAuthentication> build(String kind, SVNURL url) {
             if (ISVNAuthenticationManager.SSL.equals(kind)) {
+                SVNSSLAuthentication authentication =
+                        new SVNSSLAuthentication(certificateFile, Scrambler.descramble(password), false, url, false);
+                authentication.setCertificatePath("dummy"); // TODO: remove this JENKINS-19175 workaround
                 return Collections.<SVNAuthentication>singletonList(
-                        new SVNSSLAuthentication(certificateFile, Scrambler.descramble(password), false, url, false));
+                        authentication);
             }
             return Collections.emptyList();
         }

diff --git a/src/main/java/hudson/scm/SubversionSCM.java b/src/main/java/hudson/scm/SubversionSCM.java
@@ -27,7 +27,6 @@
 package hudson.scm;
 
 import static hudson.Util.fixEmptyAndTrim;
-import static hudson.Util.getDigestOf;
 import static hudson.scm.PollingResult.BUILD_NOW;
 import static hudson.scm.PollingResult.NO_CHANGES;
 import static java.util.logging.Level.FINE;
@@ -36,12 +35,10 @@
 import com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey;
 import com.cloudbees.plugins.credentials.CredentialsMatchers;
 import com.cloudbees.plugins.credentials.CredentialsProvider;
-import com.cloudbees.plugins.credentials.common.StandardCertificateCredentials;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
 import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
 import com.cloudbees.plugins.credentials.common.StandardUsernameListBoxModel;
 import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
-import com.cloudbees.plugins.credentials.domains.DomainRequirement;
 import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
 import hudson.EnvVars;
 import hudson.Extension;
@@ -59,16 +56,7 @@
 import hudson.model.Computer;
 import hudson.model.Hudson;
 
-import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableEntryException;
-import java.security.cert.CertificateException;
 import java.util.Arrays;
-import java.util.Enumeration;
 import java.util.WeakHashMap;
 
 import hudson.security.ACL;