diff --git a/pom.xml b/pom.xml
index fca1ba3..56ffa1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
org.cobbzilla
s3s3mirror
- 2.1.5-SNAPSHOT
+ 2.1.6-SNAPSHOT
jar
diff --git a/s3s3mirror.bat b/s3s3mirror.bat
index 1a6aab8..d953992 100755
--- a/s3s3mirror.bat
+++ b/s3s3mirror.bat
@@ -1,2 +1,2 @@
@echo off
-java -Ds3s3mirror.version=2.1.5 -jar target/s3s3mirror-2.1.4-SNAPSHOT.jar %*
+java -Ds3s3mirror.version=2.1.6 -jar target/s3s3mirror-2.1.4-SNAPSHOT.jar %*
diff --git a/s3s3mirror.sh b/s3s3mirror.sh
index 39ede6e..95ad213 100755
--- a/s3s3mirror.sh
+++ b/s3s3mirror.sh
@@ -3,7 +3,7 @@
THISDIR=$(cd "$(dirname $0)" && pwd)
-VERSION=2.1.5
+VERSION=2.1.6
JARFILE="${THISDIR}/target/s3s3mirror-${VERSION}-SNAPSHOT.jar"
VERSION_ARG="-Ds3s3mirror.version=${VERSION}"
diff --git a/src/main/java/org/cobbzilla/s3s3mirror/KeyDeleteJob.java b/src/main/java/org/cobbzilla/s3s3mirror/KeyDeleteJob.java
index 4920724..38397f4 100644
--- a/src/main/java/org/cobbzilla/s3s3mirror/KeyDeleteJob.java
+++ b/src/main/java/org/cobbzilla/s3s3mirror/KeyDeleteJob.java
@@ -14,9 +14,13 @@ public KeyDeleteJob(AmazonS3Client client, MirrorContext context, FileSummary su
final MirrorOptions options = context.getOptions();
keysrc = summary.getKey(); // NOTE: summary.getKey is the key in the destination bucket
- if (options.hasPrefix()) {
+
+ if (options.hasDestPrefix()) {
keysrc = keysrc.substring(options.getDestPrefixLength());
- keysrc = options.getPrefix() + keyDestination;
+ }
+
+ if (options.hasPrefix()) {
+ keysrc = options.getPrefix() + keysrc;
}
}
diff --git a/src/main/java/org/cobbzilla/s3s3mirror/store/s3/master/S3DeleteMaster.java b/src/main/java/org/cobbzilla/s3s3mirror/store/s3/master/S3DeleteMaster.java
index 8d26e42..4bc6922 100644
--- a/src/main/java/org/cobbzilla/s3s3mirror/store/s3/master/S3DeleteMaster.java
+++ b/src/main/java/org/cobbzilla/s3s3mirror/store/s3/master/S3DeleteMaster.java
@@ -20,7 +20,7 @@ public S3DeleteMaster(MirrorContext context, BlockingQueue workQueue,
}
@Override protected String getPrefix(MirrorOptions options) {
- return options.hasDestPrefix() ? options.getDestPrefix() : options.getPrefix();
+ return options.hasDestPrefix() ? options.getDestPrefix() : "";
}
@Override protected String getBucket(MirrorOptions options) { return options.getDestinationBucket(); }