Minor cleanup

4 files changed, 6 insertions, 11 deletions

diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java
index 2e58455bc39..b2d1af15867 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java
@@ -80,13 +80,13 @@ public class FileDistributionRpcServer {
         try {
             if (pathToFile.isPresent()) {
                 req.returnValues().add(new StringValue(pathToFile.get().getAbsolutePath()));
-                log.log(LogLevel.INFO, "File reference '" + fileReference.value() + "' available at " + pathToFile.get());
+                log.log(LogLevel.DEBUG, "File reference '" + fileReference.value() + "' available at " + pathToFile.get());
             } else {
                 log.log(LogLevel.INFO, "File reference '" + fileReference.value() + "' not found, returning error");
                 req.setError(fileReferenceDoesNotExists, "File reference '" + fileReference.value() + "' not found");
             }
         } catch (Throwable e) {
-            log.log(LogLevel.WARNING, "File reference '" + fileReference.value() + "' got exeption: " + e.getMessage());
+            log.log(LogLevel.WARNING, "File reference '" + fileReference.value() + "' got exception: " + e.getMessage());
             req.setError(fileReferenceInternalError, "File reference '" + fileReference.value() + "' removed");
         }
         req.returnRequest();
@@ -123,5 +123,4 @@ public class FileDistributionRpcServer {
         req.returnValues().add(new Int32Value(0));
     }
 
-
 }
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
index 727786cdc78..5de006cd17c 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
@@ -107,7 +107,7 @@ public class FileDownloader {
             } else if (!file.canRead()) {
                 throw new RuntimeException("File with reference '" + fileReference.value() + "'exists, but unable to read it");
             } else {
-                fileReferenceDownloader.setDownloadStatus(fileReference.value(), 100.0);
+                fileReferenceDownloader.setDownloadStatus(fileReference, 100.0);
                 return Optional.of(file);
             }
         }
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
index d57ce4ca5de..70f22296bc1 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -85,7 +85,7 @@ public class FileReceiver {
             try {
                 inprogressFile = Files.createTempFile(tmpDirectory.toPath(), fileName, ".inprogress").toFile();
             } catch (IOException e) {
-                String msg = "Failed creating tempfile for inprogress file for(" + fileName + ") in '" + fileReferenceDir.toPath() + "': ";
+                String msg = "Failed creating temp file for inprogress file for(" + fileName + ") in '" + fileReferenceDir.toPath() + "': ";
                 log.log(LogLevel.ERROR, msg + e.getMessage(), e);
                 throw new RuntimeException(msg, e);
             }
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
index 509231ba7ff..031506487a8 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -65,7 +65,7 @@ public class FileReferenceDownloader {
                     Thread.sleep(10);
                 }
             }
-            catch (InterruptedException e) {}
+            catch (InterruptedException e) { /* ignored */}
         }
 
         if ( !downloadStarted) {
@@ -107,7 +107,7 @@ public class FileReferenceDownloader {
         if (validateResponse(request)) {
             log.log(LogLevel.DEBUG, "Request callback, OK. Req: " + request + "\nSpec: " + connection);
             if (request.returnValues().get(0).asInt32() == 0) {
-                log.log(LogLevel.INFO, "Found file reference '" + fileReference.value() + "' available at " + connection.getAddress());
+                log.log(LogLevel.DEBUG, "Found file reference '" + fileReference.value() + "' available at " + connection.getAddress());
                 return true;
             } else {
                 log.log(LogLevel.INFO, "File reference '" + fileReference.value() + "' not found for " + connection.getAddress());
@@ -169,10 +169,6 @@ public class FileReferenceDownloader {
         return status;
     }
 
-    void setDownloadStatus(String file, double completeness) {
-        setDownloadStatus(new FileReference(file), completeness);
-    }
-
     void setDownloadStatus(FileReference fileReference, double completeness) {
         synchronized (downloads) {
             downloadStatus.put(fileReference, completeness);