From 55041f6198e8861312b36f9621528fc5e4c187ce Mon Sep 17 00:00:00 2001 From: Brian DeRocher Date: Thu, 4 Aug 2016 13:06:03 -0400 Subject: [PATCH 1/2] Fixes JENKINS-37184 and JENKINS-5124 Log the exception that is thrown if Jenksins can't get info() on a subversion repository using a tunnel. When the repository factory creates the repository, set the tunnel provider based on default svn options. --- .../ListSubversionTagsParameterDefinition.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java b/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java index 8ecfbf641..c5a209f84 100644 --- a/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java +++ b/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java @@ -179,6 +179,7 @@ context, getTagsDir(), getCredentialsId(), null SVNURL repoURL = SVNURL.parseURIDecoded(getTagsDir()); SVNRepository repo = SVNRepositoryFactory.create(repoURL); + repo.setTunnelProvider( SubversionSCM.createDefaultSVNOptions() ); repo.setAuthenticationManager(authManager); SVNLogClient logClient = new SVNLogClient(authManager, null); @@ -255,6 +256,7 @@ private boolean isSVNRepositoryProjectRoot(SVNRepository repo) { return true; } } catch (SVNException e) { + LOGGER.log(Level.SEVERE, "An SVN exception occurred", e); return false; } return false; From a1bce011f93283cd2f6173289f0db2bdd3424b64 Mon Sep 17 00:00:00 2001 From: Brian DeRocher Date: Thu, 4 Aug 2016 15:08:47 -0400 Subject: [PATCH 2/2] fix coding style Removed extra spaces. --- .../ListSubversionTagsParameterDefinition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java b/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java index c5a209f84..e4059ce38 100644 --- a/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java +++ b/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java @@ -179,7 +179,7 @@ context, getTagsDir(), getCredentialsId(), null SVNURL repoURL = SVNURL.parseURIDecoded(getTagsDir()); SVNRepository repo = SVNRepositoryFactory.create(repoURL); - repo.setTunnelProvider( SubversionSCM.createDefaultSVNOptions() ); + repo.setTunnelProvider(SubversionSCM.createDefaultSVNOptions()); repo.setAuthenticationManager(authManager); SVNLogClient logClient = new SVNLogClient(authManager, null);