From 85417cdc53874016b492e46038e727ce65367608 Mon Sep 17 00:00:00 2001
From: oliviarla <imoliviarla@gmail.com>
Date: Fri, 3 Jan 2025 16:54:44 +0900
Subject: [PATCH] CLEANUP: add null check to the stringify method of command
 classes

---
 .../spy/memcached/collection/Attributes.java  |  4 ++++
 .../collection/BTreeFindPosition.java         |  1 +
 .../collection/BTreeFindPositionWithGet.java  | 22 +++++++++++--------
 .../memcached/collection/BTreeSMGetImpl.java  |  2 ++
 .../spy/memcached/collection/SetDelete.java   |  4 ++++
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/spy/memcached/collection/Attributes.java b/src/main/java/net/spy/memcached/collection/Attributes.java
index 8d361ded0..ac81ba9f8 100644
--- 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
index 529763994..a40731f8f 100644
--- 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
index f3aa2d3c5..6d7072e06 100644
--- 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
index 2a198d375..09a1a58ad 100644
--- 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
index e31066caf..ba7a64cc6 100644
--- 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);