RemoteRepositoryCacheManager should never throw the REPOSITOY_NOT_FOU…

…ND (#211) because other metadata (xml, xml.jar or xml.jar.xz) could be found in the cache, it shouldn't break directly with the first (content.xml)
eclipse-tycho · Aug 6, 2021 · c19c5e1 · c19c5e1
1 parent 01f66d1
commit c19c5e1
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/...resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java b/...resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
@@ -77,14 +77,20 @@ public File createCache(URI repositoryLocation, String prefix, IProgressMonitor
 
     @Override
     public File createCacheFromFile(URI remoteFile, IProgressMonitor monitor) throws ProvisionException, IOException {
+        File cacheFile = getCacheFile(remoteFile, getCacheDirectory());
         if (offline) {
-            File cacheFile = getCacheFile(remoteFile, getCacheDirectory());
             if (cacheFile != null) {
                 return cacheFile;
             }
             throw new ProvisionException(getFailureStatus(remoteFile));
         }
-        return super.createCacheFromFile(remoteFile, monitor);
+        try {
+            return super.createCacheFromFile(remoteFile, monitor);
+        } catch (IOException e) {
+            return handleCreateCacheException(cacheFile, remoteFile, e);
+        } catch (ProvisionException e) {
+            return handleCreateCacheException(cacheFile, remoteFile, e);
+        }
     }
 
     private Status getFailureStatus(URI uri) throws ProvisionException {
@@ -100,8 +106,8 @@ public static File getCacheFile(URI url, File dataAreaFile) {
         return new File(dataAreaFile, Integer.toString(hashCode));
     }
 
-    private <T extends Exception> File handleCreateCacheException(File cacheFile, URI repositoryLocation, T e)
-            throws T {
+    private File handleCreateCacheException(File cacheFile, URI repositoryLocation, Exception e)
+            throws ProvisionException {
         if (cacheFile != null) {
             String message = "Failed to access p2 repository " + repositoryLocation.toASCIIString()
                     + ", use local cache.";
@@ -114,7 +120,7 @@ private <T extends Exception> File handleCreateCacheException(File cacheFile, UR
             // original exception has been already logged
             return cacheFile;
         }
-        throw e;
+        throw new ProvisionException(getFailureStatus(repositoryLocation));
     }
 
     @Override