You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2019/05/02 17:07:59 UTC

[geode] branch develop updated: GEODE-6690: use the caching addStringPart method

This is an automated email from the ASF dual-hosted git repository.

dschneider pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 72eca0c  GEODE-6690: use the caching addStringPart method
72eca0c is described below

commit 72eca0c33a942db731366cacf3603a806f893e7c
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Thu May 2 10:07:48 2019 -0700

    GEODE-6690: use the caching addStringPart method
    
    now uses the caching addStringPart for region name parts
---
 .../main/java/org/apache/geode/cache/client/internal/ClearOp.java   | 2 +-
 .../java/org/apache/geode/cache/client/internal/ContainsKeyOp.java  | 2 +-
 .../main/java/org/apache/geode/cache/client/internal/DestroyOp.java | 4 ++--
 .../org/apache/geode/cache/client/internal/DestroyRegionOp.java     | 2 +-
 .../geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java   | 4 ++--
 .../apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java | 6 +++---
 .../cache/client/internal/ExecuteRegionFunctionSingleHopOp.java     | 4 ++--
 .../main/java/org/apache/geode/cache/client/internal/GetAllOp.java  | 2 +-
 .../apache/geode/cache/client/internal/GetClientPRMetaDataOp.java   | 2 +-
 .../geode/cache/client/internal/GetClientPartitionAttributesOp.java | 2 +-
 .../java/org/apache/geode/cache/client/internal/GetEntryOp.java     | 2 +-
 .../src/main/java/org/apache/geode/cache/client/internal/GetOp.java | 2 +-
 .../java/org/apache/geode/cache/client/internal/InvalidateOp.java   | 2 +-
 .../main/java/org/apache/geode/cache/client/internal/KeySetOp.java  | 2 +-
 .../main/java/org/apache/geode/cache/client/internal/PutAllOp.java  | 2 +-
 .../src/main/java/org/apache/geode/cache/client/internal/PutOp.java | 2 +-
 .../apache/geode/cache/client/internal/RegisterInterestListOp.java  | 2 +-
 .../org/apache/geode/cache/client/internal/RegisterInterestOp.java  | 2 +-
 .../java/org/apache/geode/cache/client/internal/RemoveAllOp.java    | 2 +-
 .../main/java/org/apache/geode/cache/client/internal/SizeOp.java    | 2 +-
 .../geode/cache/client/internal/UnregisterInterestListOp.java       | 2 +-
 .../apache/geode/cache/client/internal/UnregisterInterestOp.java    | 2 +-
 .../internal/cache/tier/sockets/ClientInterestMessageImpl.java      | 2 +-
 .../geode/internal/cache/tier/sockets/ClientTombstoneMessage.java   | 2 +-
 .../apache/geode/cache/client/internal/GatewaySenderBatchOp.java    | 2 +-
 25 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
index 0c1e059..0f9b940 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
@@ -65,7 +65,7 @@ public class ClearOp {
      */
     public ClearOpImpl(String region, EventID eventId, Object callbackArg) {
       super(MessageType.CLEAR_REGION, callbackArg != null ? 3 : 2);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addBytesPart(eventId.calcBytes());
       if (callbackArg != null) {
         getMessage().addObjPart(callbackArg);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
index 8159bf9..e722932 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
@@ -53,7 +53,7 @@ public class ContainsKeyOp {
      */
     public ContainsKeyOpImpl(String region, Object key, MODE mode) {
       super(MessageType.CONTAINS_KEY, 3);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addStringOrObjPart(key);
       getMessage().addIntPart(mode.ordinal());
       this.region = region;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
index 6ac95c7..dfcb6b6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
@@ -138,7 +138,7 @@ public class DestroyOp {
       this.prSingleHopEnabled = prSingleHopEnabled;
       this.callbackArg = callbackArg;
       this.event = event;
-      getMessage().addStringPart(region.getFullPath());
+      getMessage().addStringPart(region.getFullPath(), true);
       getMessage().addStringOrObjPart(key);
       getMessage().addObjPart(expectedOldValue);
       getMessage().addBytePart(operation.ordinal);
@@ -155,7 +155,7 @@ public class DestroyOp {
       this.key = key;
       this.event = event;
       this.callbackArg = callbackArg;
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addStringOrObjPart(key);
       getMessage().addObjPart(expectedOldValue);
       getMessage().addBytePart(operation.ordinal);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyRegionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyRegionOp.java
index 0cec72c..6d8ed7a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyRegionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyRegionOp.java
@@ -65,7 +65,7 @@ public class DestroyRegionOp {
      */
     public DestroyRegionOpImpl(String region, EventID eventId, Object callbackArg) {
       super(MessageType.DESTROY_REGION, callbackArg != null ? 3 : 2);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addBytesPart(eventId.calcBytes());
       if (callbackArg != null) {
         getMessage().addObjPart(callbackArg);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
index 8550a48..7c90e69 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
@@ -119,7 +119,7 @@ public class ExecuteRegionFunctionNoAckOp {
       Object args = serverRegionExecutor.getArguments();
       MemberMappedArgument memberMappedArg = serverRegionExecutor.getMemberMappedArgument();
       getMessage().addBytesPart(new byte[] {functionState});
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       if (serverRegionExecutor.isFnSerializationReqd()) {
         getMessage().addStringOrObjPart(function);
       } else {
@@ -152,7 +152,7 @@ public class ExecuteRegionFunctionNoAckOp {
       Object args = serverRegionExecutor.getArguments();
       MemberMappedArgument memberMappedArg = serverRegionExecutor.getMemberMappedArgument();
       getMessage().addBytesPart(new byte[] {functionState});
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addStringOrObjPart(functionId);
       getMessage().addObjPart(args);
       getMessage().addObjPart(memberMappedArg);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java
index 5f4f41f..94782d0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java
@@ -348,7 +348,7 @@ public class ExecuteRegionFunctionOp {
       MemberMappedArgument memberMappedArg = serverRegionExecutor.getMemberMappedArgument();
 
       addBytes(functionState);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       if (serverRegionExecutor.isFnSerializationReqd()) {
         getMessage().addStringOrObjPart(function);
       } else {
@@ -410,7 +410,7 @@ public class ExecuteRegionFunctionOp {
       Object args = serverRegionExecutor.getArguments();
       MemberMappedArgument memberMappedArg = serverRegionExecutor.getMemberMappedArgument();
       addBytes(functionState);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addStringOrObjPart(function);
       getMessage().addObjPart(args);
       getMessage().addObjPart(memberMappedArg);
@@ -467,7 +467,7 @@ public class ExecuteRegionFunctionOp {
       MemberMappedArgument memberMappedArg = executor.getMemberMappedArgument();
       getMessage().clear();
       addBytes(this.hasResult);
-      getMessage().addStringPart(this.regionName);
+      getMessage().addStringPart(this.regionName, true);
       if (executor.isFnSerializationReqd()) {
         getMessage().addStringOrObjPart(function);
       } else {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
index e4f4cb6..b33a7fc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
@@ -225,7 +225,7 @@ public class ExecuteRegionFunctionSingleHopOp {
       Object args = serverRegionExecutor.getArguments();
       MemberMappedArgument memberMappedArg = serverRegionExecutor.getMemberMappedArgument();
       addBytes(functionState);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       if (serverRegionExecutor.isFnSerializationReqd()) {
         getMessage().addStringOrObjPart(function);
       } else {
@@ -270,7 +270,7 @@ public class ExecuteRegionFunctionSingleHopOp {
           hasResult == (byte) 1 ? true : false, optimizeForWrite);
       MemberMappedArgument memberMappedArg = serverRegionExecutor.getMemberMappedArgument();
       addBytes(functionState);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addStringOrObjPart(functionId);
       getMessage().addObjPart(args);
       getMessage().addObjPart(memberMappedArg);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
index 64bfc09..fedf91b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
@@ -147,7 +147,7 @@ public class GetAllOp {
       super(callback != null ? MessageType.GET_ALL_WITH_CALLBACK : MessageType.GET_ALL_70, 3);
       this.keyList = keys;
       this.callback = callback;
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
     }
 
     @Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
index 8fcf566..77f1d63 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPRMetaDataOp.java
@@ -63,7 +63,7 @@ public class GetClientPRMetaDataOp {
       super(MessageType.GET_CLIENT_PR_METADATA, 1);
       this.regionFullPath = regionFullPath;
       this.cms = cms;
-      getMessage().addStringPart(regionFullPath);
+      getMessage().addStringPart(regionFullPath, true);
     }
 
     @Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java
index 19d8e46..645458c 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetClientPartitionAttributesOp.java
@@ -68,7 +68,7 @@ public class GetClientPartitionAttributesOp {
     public GetClientPartitionAttributesOpImpl(String regionFullPath) {
       super(MessageType.GET_CLIENT_PARTITION_ATTRIBUTES, 1);
       this.regionFullPath = regionFullPath;
-      getMessage().addStringPart(regionFullPath);
+      getMessage().addStringPart(regionFullPath, true);
     }
 
     @Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEntryOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEntryOp.java
index 75a69e4..c927b8b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEntryOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetEntryOp.java
@@ -43,7 +43,7 @@ public class GetEntryOp {
       super(MessageType.GET_ENTRY, 2);
       this.region = region;
       this.key = key;
-      getMessage().addStringPart(region.getFullPath());
+      getMessage().addStringPart(region.getFullPath(), true);
       getMessage().addStringOrObjPart(key);
     }
 
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetOp.java
index cce4c29..ec1f889 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetOp.java
@@ -126,7 +126,7 @@ public class GetOp {
       this.key = key;
       this.callbackArg = callbackArg;
       this.clientEvent = clientEvent;
-      getMessage().addStringPart(region.getFullPath());
+      getMessage().addStringPart(region.getFullPath(), true);
       getMessage().addStringOrObjPart(key);
       if (callbackArg != null) {
         getMessage().addObjPart(callbackArg);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InvalidateOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InvalidateOp.java
index 97d233c..45fb1c0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/InvalidateOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/InvalidateOp.java
@@ -60,7 +60,7 @@ public class InvalidateOp {
       super(MessageType.INVALIDATE, event.getCallbackArgument() != null ? 4 : 3);
       Object callbackArg = event.getCallbackArgument();
       this.event = event;
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addStringOrObjPart(event.getKeyInfo().getKey());
       getMessage().addBytesPart(event.getEventId().calcBytes());
       if (callbackArg != null) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java
index 65dc961..edcce48 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/KeySetOp.java
@@ -54,7 +54,7 @@ public class KeySetOp {
      */
     public KeySetOpImpl(String region) {
       super(MessageType.KEY_SET, 1);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
     }
 
     @Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java
index be2b2be..aac819f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutAllOp.java
@@ -266,7 +266,7 @@ public class PutAllOp {
           (callbackArg != null ? 6 : 5) + (map.size() * 2));
       this.prSingleHopEnabled = prSingleHopEnabled;
       this.region = (LocalRegion) region;
-      getMessage().addStringPart(region.getFullPath());
+      getMessage().addStringPart(region.getFullPath(), true);
       getMessage().addBytesPart(eventId.calcBytes());
       getMessage().addIntPart(skipCallbacks ? 1 : 0);
       this.map = map;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
index 2ddbc9d..57b25bd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
@@ -197,7 +197,7 @@ public class PutOp {
       this.prSingleHopEnabled = prSingleHopEnabled;
       this.requireOldValue = requireOldValue;
       this.expectedOldValue = expectedOldValue;
-      getMessage().addStringPart(regionName);
+      getMessage().addStringPart(regionName, true);
       getMessage().addBytePart(op.ordinal);
       int flags = 0;
       if (requireOldValue)
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestListOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestListOp.java
index 69acdfb..a335401 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestListOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestListOp.java
@@ -101,7 +101,7 @@ public class RegisterInterestListOp {
     public RegisterInterestListOpImpl(String region, List keys, InterestResultPolicy policy,
         boolean isDurable, boolean receiveUpdatesAsInvalidates, byte regionDataPolicy) {
       super(region, MessageType.REGISTER_INTEREST_LIST, 6);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addObjPart(policy);
       {
         byte durableByte = (byte) (isDurable ? 0x01 : 0x00);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java
index e7fe472..10ffa0c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterInterestOp.java
@@ -119,7 +119,7 @@ public class RegisterInterestOp {
         byte regionDataPolicy) {
       super(MessageType.REGISTER_INTEREST, 7);
       this.region = region;
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addIntPart(interestType);
       getMessage().addObjPart(policy);
       {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
index 209829b..57a73ba 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RemoveAllOp.java
@@ -246,7 +246,7 @@ public class RemoveAllOp {
       super(MessageType.REMOVE_ALL, 5 + keys.size());
       this.prSingleHopEnabled = prSingleHopEnabled;
       this.region = (LocalRegion) region;
-      getMessage().addStringPart(region.getFullPath());
+      getMessage().addStringPart(region.getFullPath(), true);
       getMessage().addBytesPart(eventId.calcBytes());
       this.keys = keys;
       this.callbackArg = callbackArg;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SizeOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SizeOp.java
index 27e2c01..965f37f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SizeOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SizeOp.java
@@ -45,7 +45,7 @@ public class SizeOp {
      */
     public SizeOpImpl(String region) {
       super(MessageType.SIZE, 1);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
     }
 
     @Override
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestListOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestListOp.java
index 694d3a7..2c2b540 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestListOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestListOp.java
@@ -53,7 +53,7 @@ public class UnregisterInterestListOp {
     public UnregisterInterestListOpImpl(String region, List keys, boolean isClosing,
         boolean keepAlive) {
       super(MessageType.UNREGISTER_INTEREST_LIST, 4 + keys.size());
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       {
         byte closingByte = (byte) (isClosing ? 0x01 : 0x00);
         getMessage().addBytesPart(new byte[] {closingByte});
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestOp.java
index 962858c..10d959c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/UnregisterInterestOp.java
@@ -52,7 +52,7 @@ public class UnregisterInterestOp {
     public UnregisterInterestOpImpl(String region, Object key, int interestType, boolean isClosing,
         boolean keepAlive) {
       super(MessageType.UNREGISTER_INTEREST, 5);
-      getMessage().addStringPart(region);
+      getMessage().addStringPart(region, true);
       getMessage().addIntPart(interestType);
       getMessage().addStringOrObjPart(key);
       {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
index b83b2c0..f9fa525 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
@@ -162,7 +162,7 @@ public class ClientInterestMessageImpl implements ClientMessage {
     }
 
     // Add the region name
-    message.addStringPart(this.regionName);
+    message.addStringPart(this.regionName, true);
 
     // Add the key
     message.addStringOrObjPart(this.keyOfInterest);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java
index 99b4122..7bc761b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java
@@ -94,7 +94,7 @@ public class ClientTombstoneMessage extends ClientUpdateMessageImpl {
     message = new Message(numParts, clientVersion);
     // Set message type
     message.setMessageType(MessageType.TOMBSTONE_OPERATION);
-    message.addStringPart(this.getRegionName());
+    message.addStringPart(this.getRegionName(), true);
     message.addIntPart(this.op.ordinal());
     message.addObjPart(this.removalInformation);
     message.addObjPart(getEventId());
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
index 18a01de..33f5293 100755
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
@@ -111,7 +111,7 @@ public class GatewaySenderBatchOp {
           Object callbackArg = event.getSenderCallbackArgument();
 
           // Add region name
-          getMessage().addStringPart(regionName);
+          getMessage().addStringPart(regionName, true);
           // Add event id
           getMessage().addObjPart(eventId);
           // Add key