Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INTERNAL: Call new merge method instead of existing one for new SMGetResult #739

Merged
merged 1 commit into from
Apr 1, 2024
Merged

INTERNAL: Call new merge method instead of existing one for new SMGetResult #739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/net/spy/memcached/internal/result/SMGetResultImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
Loading