JENKINS-24735 - Add support for build parameters in Subversion URLs.

* update try/catch SVNException creation in FeatureBranchProperty#integrate to new API
jenkinsci · Oct 19, 2014 · 4ef248b · 4ef248b
1 parent 7812268
commit 4ef248b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java b/src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java
@@ -301,16 +301,24 @@ public void handleEvent(SVNEvent event, double progress) throws SVNException {
                     SVNRevision mergeRev = branchRev >= 0 ? SVNRevision.create(branchRev) : wsState.getRevision();
                     // do we have any meaningful changes in this branch worthy of integration?
                     if (lastIntegrationSourceRevision !=null) {
+                        final SVNException eureka = new SVNException(SVNErrorMessage.UNKNOWN_ERROR_MESSAGE);
+                        try {
                             cm.getLogClient().doLog(new File[]{mr},mergeRev,SVNRevision.create(lastIntegrationSourceRevision),mergeRev,true,false,-1,new ISVNLogEntryHandler() {
                                 public void handleLogEntry(SVNLogEntry e) throws SVNException {
                                     if (e.getMessage().startsWith(RebaseAction.COMMIT_MESSAGE_PREFIX)
                                      || e.getMessage().startsWith(IntegrateAction.COMMIT_MESSAGE_PREFIX))
                                         return; // merge commits
+                                    throw eureka;
                                 }
                             });
                             // didn't find anything interesting. all the changes are our merges
                             logger.println("No changes to be integrated. Skipping integration.");
                             return new IntegrationResult(0,mergeRev);
+                        } catch (SVNException e) {
+                            if (e!=eureka)
+                                throw e;    // some other problems
+                            // found some changes, keep on integrating
+                        }
                     }
 
                     logger.println("Switching to the upstream (" + up+")");