From 4f30644e7db2458d1b271cb1603ea45d18a1c3f9 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Thu, 1 Nov 2018 10:35:51 +0100
Subject: [PATCH] Use cache with size zero to avoid null checks

---
 .../scm/plugin/DefaultUberWebResourceLoader.java    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java
index 6b886dd5ce..25b8390e53 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultUberWebResourceLoader.java
@@ -81,9 +81,9 @@ public class DefaultUberWebResourceLoader implements UberWebResourceLoader
     this.cache = createCache(stage);
   }
 
-  private final Cache<String, URL> createCache(Stage stage) {
+  private Cache<String, URL> createCache(Stage stage) {
     if (stage == Stage.DEVELOPMENT) {
-      return null;
+      return CacheBuilder.newBuilder().maximumSize(0).build(); // Disable caching
     }
     return CacheBuilder.newBuilder().build();
   }
@@ -121,16 +121,11 @@ public class DefaultUberWebResourceLoader implements UberWebResourceLoader
   }
 
   private URL getFromCache(String path) {
-    if (cache != null) {
-      return cache.getIfPresent(path);
-    }
-    return null;
+    return cache.getIfPresent(path);
   }
 
   private void addToCache(String path, URL url) {
-    if (cache != null) {
-      cache.put(path, url);
-    }
+    cache.put(path, url);
   }
 
   /**