#1157: Fix for S3BlobStore bulk delete (without listeners)

(failing since a133c44, test ignored since 855ed09)
GeoWebCache · Oct 16, 2023 · 6278a4d · 6278a4d
1 parent 1cfd2b5
commit 6278a4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/geowebcache/core/src/main/java/org/geowebcache/util/TMSKeyBuilder.java b/geowebcache/core/src/main/java/org/geowebcache/util/TMSKeyBuilder.java
@@ -194,7 +194,7 @@ public String parametersMetadataPrefix(final String layerName) {
      * @return the key prefix up to the coordinates (i.e. {@code
      *     "<prefix>/<layer>/<gridset>/<format>/<parametersId>"})
      */
-    public String coordinatesPrefix(TileRange obj, boolean endWithSlah) {
+    public String coordinatesPrefix(TileRange obj, boolean endWithSlash) {
         checkNotNull(obj.getLayerName());
         checkNotNull(obj.getGridSetId());
         checkNotNull(obj.getMimeType());
@@ -215,7 +215,7 @@ public String coordinatesPrefix(TileRange obj, boolean endWithSlah) {
         }
         String shortFormat = mimeType.getFileExtension(); // png, png8, png24, etc
 
-        String key = join(endWithSlah, prefix, layer, gridset, shortFormat, parametersId);
+        String key = join(endWithSlash, prefix, layer, gridset, shortFormat, parametersId);
         return key;
     }
 

diff --git a/geowebcache/s3storage/src/main/java/org/geowebcache/s3/S3BlobStore.java b/geowebcache/s3storage/src/main/java/org/geowebcache/s3/S3BlobStore.java
@@ -311,7 +311,7 @@ public KeyVersion apply(long[] loc) {
     @Override
     public boolean delete(final TileRange tileRange) throws StorageException {
 
-        final String coordsPrefix = keyBuilder.coordinatesPrefix(tileRange, false);
+        final String coordsPrefix = keyBuilder.coordinatesPrefix(tileRange, true);
         if (!s3Ops.prefixExists(coordsPrefix)) {
             return false;
         }