Add error messages

onlyskin · onlyskin · commit 45a09459249c · 2017-12-19T19:42:19.000+02:00
diff --git a/src/main/java/httpserver/Hasher.java b/src/main/java/httpserver/Hasher.java
@@ -9,14 +9,14 @@ public boolean matches(byte[] input, String hash) {
     }
 
     public String getHash(byte[] input) {
-        MessageDigest messageDigest = null;
         try {
-            messageDigest = MessageDigest.getInstance("SHA1");
+            MessageDigest messageDigest = MessageDigest.getInstance("SHA1");
+            byte[] hash = messageDigest.digest(input);
+            return bytesToHex(hash);
         } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
+            System.out.println("Unable to get hash.");
+            return "";
         }
-        byte[] hash = messageDigest.digest(input);
-        return bytesToHex(hash);
     }
 
     private String bytesToHex(byte[] hash) {
diff --git a/src/main/java/httpserver/Logger.java b/src/main/java/httpserver/Logger.java
@@ -27,7 +27,9 @@ public void log(String logString) {
     private void createFileIfDoesntExist(Path path) {
         try {
             fileOperator.createFileAtPath(path);
-        } catch (IOException e) {}
+        } catch (IOException e) {
+            System.out.println("Coudln't create log file");
+        }
     }
 
     public byte[] readLog() {
diff --git a/src/main/java/httpserver/Server.java b/src/main/java/httpserver/Server.java
@@ -20,6 +20,7 @@ public void acceptConnection(ExecutorService executorService, SocketHandlerFacto
             SocketHandler socketHandler = socketHandlerFactory.newSocketHandler(appConfig, clientSocket);
             executorService.submit(socketHandler);
         } catch (IOException e) {
+            System.out.println("Server socket error");
             e.printStackTrace();
         }
     }
diff --git a/src/main/java/httpserver/file/PathExaminer.java b/src/main/java/httpserver/file/PathExaminer.java
@@ -50,7 +50,7 @@ public Path[] directoryContents(Path dir) {
                 result.add(entry);
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            System.out.println("Couldn't retrieve directory contents for directory at " + dir.toString());
         }
         return result.toArray(new Path[0]);
     }

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ public boolean matches(byte[] input, String hash) {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`public String getHash(byte[] input) {`
`12`		`- MessageDigest messageDigest = null;`
`13`	`12`	`try {`
`14`		`- messageDigest = MessageDigest.getInstance("SHA1");`
	`13`	`+ MessageDigest messageDigest = MessageDigest.getInstance("SHA1");`
	`14`	`+ byte[] hash = messageDigest.digest(input);`
	`15`	`+ return bytesToHex(hash);`
`15`	`16`	`} catch (NoSuchAlgorithmException e) {`
`16`		`- e.printStackTrace();`
	`17`	`+ System.out.println("Unable to get hash.");`
	`18`	`+ return "";`
`17`	`19`	`}`
`18`		`- byte[] hash = messageDigest.digest(input);`
`19`		`- return bytesToHex(hash);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`private String bytesToHex(byte[] hash) {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public void acceptConnection(ExecutorService executorService, SocketHandlerFacto`
`20`	`20`	`SocketHandler socketHandler = socketHandlerFactory.newSocketHandler(appConfig, clientSocket);`
`21`	`21`	`executorService.submit(socketHandler);`
`22`	`22`	`} catch (IOException e) {`
	`23`	`+ System.out.println("Server socket error");`
`23`	`24`	`e.printStackTrace();`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public Path[] directoryContents(Path dir) {`
`50`	`50`	`result.add(entry);`
`51`	`51`	`}`
`52`	`52`	`} catch (IOException e) {`
`53`		`- e.printStackTrace();`
	`53`	`+ System.out.println("Couldn't retrieve directory contents for directory at " + dir.toString());`
`54`	`54`	`}`
`55`	`55`	`return result.toArray(new Path[0]);`
`56`	`56`	`}`