commit bfc4f66f998de993d30c0441d47bcc313e08bfb3
author Robert Munteanu <rombert@apache.org> Tue Oct 16 17:18:58 2018 +0300
committer Robert Munteanu <rombert@apache.org> Tue Oct 16 17:16:00 2018 +0200
tree c14bd50b67d5ad0f668d299ab664b74000b15da5
parent a1d70e1431b61c101d97762c439db4832041f084

Handle missing SVN revisions

src/main/java/org/apache/sling/tooling/lc/svn/SvnChangeLogFinder.java

diff --git a/src/main/java/org/apache/sling/tooling/lc/svn/SvnChangeLogFinder.java b/src/main/java/org/apache/sling/tooling/lc/svn/SvnChangeLogFinder.java
index dd1fc9c..44dc663 100644
--- a/src/main/java/org/apache/sling/tooling/lc/svn/SvnChangeLogFinder.java
+++ b/src/main/java/org/apache/sling/tooling/lc/svn/SvnChangeLogFinder.java
@@ -17,8 +17,10 @@
 package org.apache.sling.tooling.lc.svn;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
+import org.tmatesoft.svn.core.SVNDirEntry;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
 import org.tmatesoft.svn.core.io.SVNRepository;
@@ -45,8 +47,16 @@
         
         SVNRepository repo = manager.getRepositoryPool().createRepository(svnUrl, true);
         
-        SVNRevision from = SVNRevision.create(getRevision(first, repo));
-        SVNRevision to = SVNRevision.create(getRevision(second, repo));
+        final long fromRev = getRevision(first, repo);
+        final long toRev = getRevision(second, repo);
+        
+        if ( fromRev == -1 || toRev == -1 ) {
+            System.err.println("Failed retrieving changes from SVN; revisions were " + fromRev + " and " + toRev);
+            return Collections.emptyList();
+        }
+        
+        SVNRevision from = SVNRevision.create(fromRev);
+        SVNRevision to = SVNRevision.create(toRev);
         
         repo.log(new String[] { "tags/" + second } ,from.getNumber(), to.getNumber(), false, false, (e) -> changes.add(e.getMessage()));
         
@@ -56,7 +66,11 @@
 
     private long getRevision(String tagName, SVNRepository repo) throws SVNException {
         
-        return repo.info("tags/" + tagName, -1).getRevision();
+        SVNDirEntry info = repo.info("tags/" + tagName, -1);
+        if ( info == null ) 
+            return -1;
+        
+        return info.getRevision();
     }
 
 }