Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly remove prefix in DelimiterFilter 

Previously this called String.replaceFirst which uses a regular
expression and incorrectly handles characters like *.  Also remove
other correct but unnecessary call to String.replaceFirst.
This commit is contained in:
Andrew Gaul 2016-02-09 10:43:12 -08:00
parent 4ecb078092
commit a697396e8c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
View File

@ -39,7 +39,6 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.UUID;
import java.util.regex.Pattern;
import javax.annotation.Resource;
import javax.inject.Inject;
@ -473,7 +472,7 @@ public final class LocalBlobStore implements BlobStore {
return name.indexOf(delimiter) == -1;
}
if (name.startsWith(prefix)) {
String unprefixedName = name.replaceFirst(prefix, "");
String unprefixedName = name.substring(prefix.length());
if (unprefixedName.equals("")) {
// a blob that matches the prefix should also be returned
return true;
@ -498,7 +497,7 @@ public final class LocalBlobStore implements BlobStore {
String working = metadata.getName();
if (prefix != null) {
if (working.startsWith(prefix)) {
working = working.replaceFirst(Pattern.quote(prefix), "");
working = working.substring(prefix.length());
} else {
return NO_PREFIX;
}