[JENKINS-16711] If a revision (@NNN) is specified in the repository U…

…RL, it is considered in the validation process
jenkinsci · Dec 17, 2015 · defa208 · defa208
1 parent 3a9cf51
commit defa208
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/java/hudson/scm/SubversionSCM.java b/src/main/java/hudson/scm/SubversionSCM.java
@@ -77,11 +77,9 @@
 import java.util.LinkedHashSet;
 import java.util.WeakHashMap;
 
-import hudson.remoting.LocalChannel;
 import hudson.security.ACL;
 import hudson.util.ListBoxModel;
 import jenkins.model.Jenkins;
-import jenkins.model.Jenkins.MasterComputer;
 import hudson.remoting.Callable;
 import hudson.remoting.Channel;
 import hudson.remoting.VirtualChannel;
@@ -163,6 +161,7 @@
 import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
 import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
 import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
+import org.tmatesoft.svn.core.internal.wc.SVNPath;
 import org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory;
 import org.tmatesoft.svn.core.io.SVNCapability;
 import org.tmatesoft.svn.core.io.SVNRepository;
@@ -3077,6 +3076,12 @@ public FormValidation doCheckCredentialsId(StaplerRequest req, @AncestorInPath I
              */
             public FormValidation checkCredentialsId(StaplerRequest req, @Nonnull Item context, String remote, String value) {
 
+                // Ignore validation if repository URL is empty
+                String url = Util.fixEmptyAndTrim(remote);
+                if (url == null) {
+                    return FormValidation.ok();
+                }
+
                 // Is the repository URL parameterized?
                 if (remote.indexOf('$') != -1) {
                     return FormValidation.warning("The repository URL is parameterized, connection check skipped");
@@ -3085,10 +3090,12 @@ public FormValidation checkCredentialsId(StaplerRequest req, @Nonnull Item conte
                 try {
                     SVNURL repoURL = SVNURL.parseURIEncoded(remote);
                     StandardCredentials credentials = lookupCredentials(context, value, repoURL);
-                    SVNRepository repo = descriptor().getRepository(context, repoURL, credentials, Collections.<String, Credentials>emptyMap(), null);
+                    SVNRepository repo = descriptor().getRepository(context, repoURL, credentials, Collections
+                            .<String, Credentials>emptyMap(), null);
                     String repoRoot = repo.getRepositoryRoot(false).toString();
                     String repoPath = repo.getLocation().toString().substring(repoRoot.length());
-                    SVNNodeKind svnNodeKind = repo.checkPath(repoPath, SVNRevision.HEAD.getNumber());
+                    SVNPath path = new SVNPath(repoPath, true, true);
+                    SVNNodeKind svnNodeKind = repo.checkPath(path.getTarget(), path.getPegRevision().getNumber());
                     if (svnNodeKind != SVNNodeKind.DIR) {
                         return FormValidation.error("Credentials looks fine but the repository URL is invalid");
                     }