Fix null pointer exception (#707)

apache · Jun 19, 2023 · 7fcd47d · 7fcd47d
1 parent 4ad3f58
commit 7fcd47d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
@@ -51,19 +51,19 @@ public TileCache(TileStore tileStore, CaffeineSpec spec) {
   /** {@inheritDoc} */
   @Override
   public ByteBuffer read(TileCoord tileCoord) throws TileStoreException {
-    return cache.get(tileCoord, t -> {
+    var buffer = cache.get(tileCoord, t -> {
       try {
-        var buffer = tileStore.read(t);
-        if (buffer == null) {
-          return null;
-        } else {
-          return buffer;
-        }
+        return tileStore.read(t);
       } catch (TileStoreException e) {
         logger.error("Unable to read the tile.", e);
         return null;
       }
-    }).duplicate();
+    });
+    if (buffer == null) {
+      return null;
+    } else {
+      return buffer.duplicate();
+    }
   }
 
   /** {@inheritDoc} */