INTERNAL: Call new merge method instead of �existing one for new SMGetResult.

uhm0311 · jhpark816 · commit 215b2d9ea8c1 · 2024-04-01T10:44:57.000+09:00
diff --git a/src/main/java/net/spy/memcached/internal/result/SMGetResultImpl.java b/src/main/java/net/spy/memcached/internal/result/SMGetResultImpl.java
@@ -36,7 +36,8 @@ public void setFailedOperationStatus(OperationStatus status) {
     missedKeyMap.clear();
   }
 
-  public void mergeSMGetElements(final List<SMGetElement<T>> eachResult) {
+  @Deprecated
+  private void mergeSMGetElementsOld(final List<SMGetElement<T>> eachResult) {
     if (mergedResult.isEmpty()) {
       mergedResult.addAll(eachResult);
 
@@ -91,7 +92,7 @@ public void mergeSMGetElements(final List<SMGetElement<T>> eachResult) {
     }
   }
 
-  private void mergeSMGetElements2(final List<SMGetElement<T>> eachResult) {
+  public void mergeSMGetElements(final List<SMGetElement<T>> eachResult) {
     if (mergedResult.isEmpty()) {
       // merged result is empty, add all.
       mergedResult.addAll(eachResult);

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ public void setFailedOperationStatus(OperationStatus status) {`
`36`	`36`	`missedKeyMap.clear();`
`37`	`37`	`}`
`38`	`38`
`39`		`- public void mergeSMGetElements(final List<SMGetElement<T>> eachResult) {`
	`39`	`+ @Deprecated`
	`40`	`+ private void mergeSMGetElementsOld(final List<SMGetElement<T>> eachResult) {`
`40`	`41`	`if (mergedResult.isEmpty()) {`
`41`	`42`	`mergedResult.addAll(eachResult);`
`42`	`43`
`@@ -91,7 +92,7 @@ public void mergeSMGetElements(final List<SMGetElement<T>> eachResult) {`
`91`	`92`	`}`
`92`	`93`	`}`
`93`	`94`
`94`		`- private void mergeSMGetElements2(final List<SMGetElement<T>> eachResult) {`
	`95`	`+ public void mergeSMGetElements(final List<SMGetElement<T>> eachResult) {`
`95`	`96`	`if (mergedResult.isEmpty()) {`
`96`	`97`	`// merged result is empty, add all.`
`97`	`98`	`mergedResult.addAll(eachResult);`