diff --git a/geowebcache/core/src/main/java/org/geowebcache/util/TMSKeyBuilder.java b/geowebcache/core/src/main/java/org/geowebcache/util/TMSKeyBuilder.java index 4263d78e5..e8ac9b1eb 100644 --- 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 * "////"}) */ - 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 index 4bc8c6076..4c222ef70 100644 --- 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; } diff --git a/geowebcache/s3storage/src/test/java/org/geowebcache/s3/OfflineS3BlobStoreIntegrationTest.java b/geowebcache/s3storage/src/test/java/org/geowebcache/s3/OfflineS3BlobStoreIntegrationTest.java index 8b113c2c2..8ec7f6bc2 100644 --- a/geowebcache/s3storage/src/test/java/org/geowebcache/s3/OfflineS3BlobStoreIntegrationTest.java +++ b/geowebcache/s3storage/src/test/java/org/geowebcache/s3/OfflineS3BlobStoreIntegrationTest.java @@ -52,7 +52,6 @@ protected S3BlobStoreInfo getConfiguration() { } @Override - @Ignore // randomly fails @Test public void testTruncateOptimizationIfNoListeners() throws StorageException, MimeException { super.testTruncateOptimizationIfNoListeners();