commit 8b88d567fec0a9cfc030820f076fcca7b021f310
author David Pursehouse <david.pursehouse@sonymobile.com> Fri Feb 27 04:10:51 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 27 04:10:51 2015 +0000
tree 6a6e089f6c5f882306efeb2fe7d21fcb85545cb2
parent 614f128571cf486e95bfaf1daff6745b3b3d2926
parent 1337e9726bea6d6a88364768546f7a22aa09e7b4

Merge "SiteLibraryLoaderUtil: catch NoSuchFileException when scanning for JARs"

gerrit-common/src/main/java/com/google/gerrit/common/SiteLibraryLoaderUtil.java

diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/SiteLibraryLoaderUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/SiteLibraryLoaderUtil.java
index 24451a4..2511a51 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/SiteLibraryLoaderUtil.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/SiteLibraryLoaderUtil.java
@@ -17,6 +17,7 @@
 import static com.google.gerrit.common.FileUtil.lastModified;
 
 import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
 
 import org.slf4j.Logger;
@@ -25,6 +26,7 @@
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.List;
 
@@ -60,6 +62,8 @@
               .result();
         }
       }.sortedCopy(jars);
+    } catch (NoSuchFileException nsfe) {
+      return ImmutableList.of();
     }
   }