CLEANUP: add null check to the stringify method of command classes

naver · Jan 3, 2025 · 85417cd · 85417cd
1 parent d4cf39a
commit 85417cd
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/src/main/java/net/spy/memcached/collection/Attributes.java b/src/main/java/net/spy/memcached/collection/Attributes.java
@@ -36,6 +36,10 @@ public Attributes(Integer expireTime) {
   }
 
   protected String stringify() {
+    if (str != null) {
+      return str;
+    }
+
     StringBuilder b = new StringBuilder();
 
     if (flags != null) {

diff --git a/src/main/java/net/spy/memcached/collection/BTreeFindPosition.java b/src/main/java/net/spy/memcached/collection/BTreeFindPosition.java
@@ -50,6 +50,7 @@ public String stringify() {
     if (str != null) {
       return str;
     }
+
     StringBuilder b = new StringBuilder();
     b.append(bkey);
     b.append(" ");

diff --git a/src/main/java/net/spy/memcached/collection/BTreeFindPositionWithGet.java b/src/main/java/net/spy/memcached/collection/BTreeFindPositionWithGet.java
@@ -66,17 +66,21 @@ public BTreeFindPositionWithGet(byte[] byteArrayBKey, BTreeOrder order, int coun
   }
 
   public String stringify() {
-    if (str == null) {
-      StringBuilder b = new StringBuilder();
-      b.append(bkeyObject);
+    if (str != null) {
+      return str;
+    }
+
+    StringBuilder b = new StringBuilder();
+    b.append(bkeyObject);
+    b.append(" ");
+    b.append(order.getAscii());
+
+    if (count > 0) {
       b.append(" ");
-      b.append(order.getAscii());
-      if (count > 0) {
-        b.append(" ");
-        b.append(String.valueOf(count));
-      }
-      str = b.toString();
+      b.append(String.valueOf(count));
     }
+
+    str = b.toString();
     return str;
   }
 

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGetImpl.java b/src/main/java/net/spy/memcached/collection/BTreeSMGetImpl.java
@@ -106,6 +106,7 @@ public String stringify() {
     if (str != null) {
       return str;
     }
+
     StringBuilder b = new StringBuilder();
     b.append(KeyUtil.getKeyBytes(getSpaceSeparatedKeys()).length);
     b.append(" ").append(keyList.size());
@@ -122,6 +123,7 @@ public String stringify() {
       }
       b.append(" ").append(count);
     }
+
     str = b.toString();
     return str;
   }

diff --git a/src/main/java/net/spy/memcached/collection/SetDelete.java b/src/main/java/net/spy/memcached/collection/SetDelete.java
@@ -51,6 +51,10 @@ public byte[] getAdditionalArgs() {
   }
 
   public String stringify() {
+    if (str != null) {
+      return str;
+    }
+
     StringBuilder b = new StringBuilder();
     b.append(additionalArgs.length);