Split out common code into a method

1 files changed, 8 insertions, 6 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java
index 7ec60985007..e48ad3c8759 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java
@@ -84,13 +84,9 @@ class UrlDownloadRpcServer {
             else
                 req.setError(DOES_NOT_EXIST, "URL '" + url + "' not found");
         } catch (RuntimeException e) {
-            String message = "Download of '" + url + "' failed: " + Exceptions.toMessageString(e);
-            log.log(Level.SEVERE, message);
-            req.setError(HTTP_ERROR, e.getMessage());
+            logAndSetRpcError(req, url, e, HTTP_ERROR);
         } catch (Throwable e) {
-            String message = "Download of '" + url + "' failed: " + Exceptions.toMessageString(e);
-            log.log(Level.SEVERE, message);
-            req.setError(INTERNAL_ERROR, message);
+            logAndSetRpcError(req, url, e, INTERNAL_ERROR);
         }
         req.returnRequest();
     }
@@ -101,6 +97,12 @@ class UrlDownloadRpcServer {
                 : new UrlDownloader().downloadFile(url, downloadDir);
     }
 
+    private static void logAndSetRpcError(Request req, String url, Throwable e, int rpcErrorCode) {
+        String message = "Download of '" + url + "' failed: " + Exceptions.toMessageString(e);
+        log.log(Level.SEVERE, message);
+        req.setError(rpcErrorCode, e.getMessage());
+    }
+
     private static String urlToDirName(String uri) {
         return String.valueOf(XXHashFactory.fastestJavaInstance().hash64().hash(ByteBuffer.wrap(Utf8.toBytes(uri)), 0));
     }