Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions src/main/java/net/spy/memcached/ArcusClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -952,8 +952,8 @@ <T> CollectionFuture<Map<Integer, CollectionOperationStatus>> asyncCollectionPip

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

final List<OperationStatus> mergedOperationStatus = Collections
.synchronizedList(new ArrayList<OperationStatus>(updateList.size()));
final List<CollectionOperationStatus> mergedOperationStatus = Collections
.synchronizedList(new ArrayList<CollectionOperationStatus>(updateList.size()));

final Map<Integer, CollectionOperationStatus> mergedResult =
new ConcurrentHashMap<Integer, CollectionOperationStatus>();
Expand Down Expand Up @@ -1058,9 +1058,9 @@ public Map<Integer, CollectionOperationStatus> get(long duration,

@Override
public CollectionOperationStatus getOperationStatus() {
for (OperationStatus status : mergedOperationStatus) {
for (CollectionOperationStatus status : mergedOperationStatus) {
if (!status.isSuccess()) {
return new CollectionOperationStatus(status);
return status;
}
}
return new CollectionOperationStatus(true, "END", CollectionResponse.END);
Expand Down Expand Up @@ -3907,8 +3907,8 @@ <T> CollectionFuture<Map<Integer, CollectionOperationStatus>> asyncCollectionPip

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

final List<OperationStatus> mergedOperationStatus = Collections
.synchronizedList(new ArrayList<OperationStatus>(insertList.size()));
final List<CollectionOperationStatus> mergedOperationStatus = Collections
.synchronizedList(new ArrayList<CollectionOperationStatus>(insertList.size()));

final Map<Integer, CollectionOperationStatus> mergedResult =
new ConcurrentHashMap<Integer, CollectionOperationStatus>();
Expand Down Expand Up @@ -4012,9 +4012,9 @@ public Map<Integer, CollectionOperationStatus> get(long duration,

@Override
public CollectionOperationStatus getOperationStatus() {
for (OperationStatus status : mergedOperationStatus) {
for (CollectionOperationStatus status : mergedOperationStatus) {
if (!status.isSuccess()) {
return new CollectionOperationStatus(status);
return status;
}
}
return new CollectionOperationStatus(true, "END", CollectionResponse.END);
Expand Down