1 files changed, 12 insertions, 2 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RemoveLocationMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RemoveLocationMessage.java
index 957e65c54e1..25862eb39f3 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RemoveLocationMessage.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RemoveLocationMessage.java
@@ -6,15 +6,17 @@ import com.yahoo.document.select.BucketSelector;
 import java.util.Set;
 
 /**
- * Message (VDS only) to remove an entire location for users using n= or g= schemes.
+ * Message to remove an entire location for users using n= or g= schemes.
  * We use a document selection so the user can specify a subset of those documents to be deleted
  * if they wish.
  */
 public class RemoveLocationMessage extends DocumentMessage {
     String documentSelection;
     BucketId bucketId;
+    private final String bucketSpace;
 
-    public RemoveLocationMessage(String documentSelection) {
+    public RemoveLocationMessage(String documentSelection, String bucketSpace) {
+        this.bucketSpace = bucketSpace;
         try {
             this.documentSelection = documentSelection;
             BucketSelector bucketSel = new BucketSelector(new BucketIdFactory());
@@ -32,6 +34,10 @@ public class RemoveLocationMessage extends DocumentMessage {
         }
     }
 
+    public RemoveLocationMessage(String documentSelection) {
+        this(documentSelection, FixedBucketSpaces.defaultSpace());
+    }
+
     public String getDocumentSelection() {
         return documentSelection;
     }
@@ -49,4 +55,8 @@ public class RemoveLocationMessage extends DocumentMessage {
     public BucketId getBucketId() {
         return bucketId;
     }
+
+    public String getBucketSpace() {
+        return bucketSpace;
+    }
 }