commit 8ad7c610a2f450f6acf2b7985c2bc4c081fc7adb
author Hugo Arès <hugo.ares@ericsson.com> Wed Apr 19 06:33:53 2017 -0400
committer Hugo Arès <hugo.ares@ericsson.com> Wed Apr 19 06:35:26 2017 -0400
tree f285a72daa1c9daf40987c78ff0c5f25b5fdc7c9
parent 730f4e8111d03f893e5fdc82473c4a82a4ddb00b
parent bdc79300cd4103f0ca76f5d18a777e5ba9dc331a

Merge branch 'stable-2.13'

* stable-2.13:
  Use path.toFile().exists() instead of Files.exists(path)
  Fix possible NPE flagged by SonarQube

Change-Id: I34a90f9f26b80a884e393f8c47e94bb9dec70b5c

src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
index 137a7ae..b162141 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
@@ -79,9 +79,11 @@
   public void cleanUp() {
     for (Path path : listFiles()) {
       Val val = readFile(path);
-      DateTime expires = new DateTime(val.getExpiresAt());
-      if (expires.isBefore(new DateTime())) {
-        deleteFile(path);
+      if (val != null) {
+        DateTime expires = new DateTime(val.getExpiresAt());
+        if (expires.isBefore(new DateTime())) {
+          deleteFile(path);
+        }
       }
     }
   }
@@ -179,7 +181,7 @@
   }
 
   private Val readFile(Path path) {
-    if (Files.exists(path)) {
+    if (path.toFile().exists()) {
       try (InputStream fileStream = Files.newInputStream(path);
           ObjectInputStream objStream = new ObjectInputStream(fileStream)) {
         return (Val) objStream.readObject();