Skip to content

Commit 366d89d

Browse files
committed
FIX: getOperationStatus method in asyncCollectionPipedInsert/Update.
1 parent 0119a75 commit 366d89d

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/main/java/net/spy/memcached/ArcusClient.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,8 @@ <T> CollectionFuture<Map<Integer, CollectionOperationStatus>> asyncCollectionPip
952952

953953
final CountDownLatch latch = new CountDownLatch(updateList.size());
954954

955-
final List<OperationStatus> mergedOperationStatus = Collections
956-
.synchronizedList(new ArrayList<OperationStatus>(updateList.size()));
955+
final List<CollectionOperationStatus> mergedOperationStatus = Collections
956+
.synchronizedList(new ArrayList<CollectionOperationStatus>(updateList.size()));
957957

958958
final Map<Integer, CollectionOperationStatus> mergedResult =
959959
new ConcurrentHashMap<Integer, CollectionOperationStatus>();
@@ -1058,12 +1058,12 @@ public Map<Integer, CollectionOperationStatus> get(long duration,
10581058

10591059
@Override
10601060
public CollectionOperationStatus getOperationStatus() {
1061-
for (OperationStatus status : mergedOperationStatus) {
1061+
for (CollectionOperationStatus status : mergedOperationStatus) {
10621062
if (!status.isSuccess()) {
1063-
return new CollectionOperationStatus(status);
1063+
return status;
10641064
}
10651065
}
1066-
return new CollectionOperationStatus(true, "END", CollectionResponse.END);
1066+
return mergedOperationStatus.get(0);
10671067
}
10681068

10691069
@Override
@@ -3907,8 +3907,8 @@ <T> CollectionFuture<Map<Integer, CollectionOperationStatus>> asyncCollectionPip
39073907

39083908
final CountDownLatch latch = new CountDownLatch(insertList.size());
39093909

3910-
final List<OperationStatus> mergedOperationStatus = Collections
3911-
.synchronizedList(new ArrayList<OperationStatus>(insertList.size()));
3910+
final List<CollectionOperationStatus> mergedOperationStatus = Collections
3911+
.synchronizedList(new ArrayList<CollectionOperationStatus>(insertList.size()));
39123912

39133913
final Map<Integer, CollectionOperationStatus> mergedResult =
39143914
new ConcurrentHashMap<Integer, CollectionOperationStatus>();
@@ -4012,12 +4012,12 @@ public Map<Integer, CollectionOperationStatus> get(long duration,
40124012

40134013
@Override
40144014
public CollectionOperationStatus getOperationStatus() {
4015-
for (OperationStatus status : mergedOperationStatus) {
4015+
for (CollectionOperationStatus status : mergedOperationStatus) {
40164016
if (!status.isSuccess()) {
4017-
return new CollectionOperationStatus(status);
4017+
return status;
40184018
}
40194019
}
4020-
return new CollectionOperationStatus(true, "END", CollectionResponse.END);
4020+
return mergedOperationStatus.get(0);
40214021
}
40224022

40234023
@Override

0 commit comments

Comments
 (0)