Alissa Bonas has uploaded a new change for review.
Change subject: frontend: use entryset in GWTRPCCommunicationProvider
......................................................................
frontend: use entryset in GWTRPCCommunicationProvider
Use entryset instead of keyset for more efficient map interation.
Solves findbug warning of type WMI_WRONG_MAP_ITERATOR
Change-Id: Ifaff47aaba96f6fb7a115af63c239b63077a4632
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
1 file changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/21618/1
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
index a62121a..b1b132c 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
@@ -174,11 +174,11 @@
@Override
public void onFailure(final Throwable exception) {
Map<VdcOperationCallback<?, ?>, List<VdcOperation<?, ?>>>
callbackMap = getCallbackMap(queriesList);
- for (VdcOperationCallback<?, ?> callback:
callbackMap.keySet()) {
- if (callback instanceof VdcOperationCallbackList) {
- ((VdcOperationCallbackList)
callback).onFailure(callbackMap.get(callback), exception);
+ for (Map.Entry<VdcOperationCallback<?, ?>,
List<VdcOperation<?, ?>>> callbackEntry: callbackMap.entrySet()) {
+ if (callbackEntry.getKey() instanceof
VdcOperationCallbackList) {
+ ((VdcOperationCallbackList)
callbackEntry.getKey()).onFailure(callbackEntry.getValue(), exception);
} else {
- ((VdcOperationCallback)
callback).onFailure(callbackMap.get(callback).get(0), exception);
+ ((VdcOperationCallback)
callbackEntry.getKey()).onFailure(callbackEntry.getValue().get(0), exception);
}
}
}
@@ -186,13 +186,13 @@
@Override
public void onSuccess(final ArrayList<VdcQueryReturnValue>
result) {
Map<VdcOperationCallback<?, ?>, List<VdcOperation<?, ?>>>
callbackMap = getCallbackMap(queriesList);
- for (VdcOperationCallback<?, ?> callback:
callbackMap.keySet()) {
+ for (Map.Entry<VdcOperationCallback<?, ?>,
List<VdcOperation<?, ?>>> callbackEntry: callbackMap.entrySet()) {
List<VdcQueryReturnValue> queryResult =
(List<VdcQueryReturnValue>) getOperationResult(
- callbackMap.get(callback), queriesList,
result);
- if (callback instanceof VdcOperationCallbackList) {
- ((VdcOperationCallbackList)
callback).onSuccess(callbackMap.get(callback), queryResult);
+ callbackEntry.getValue(), queriesList, result);
+ if (callbackEntry.getKey() instanceof
VdcOperationCallbackList) {
+ ((VdcOperationCallbackList)
callbackEntry.getKey()).onSuccess(callbackEntry.getValue(), queryResult);
} else {
- ((VdcOperationCallback)
callback).onSuccess(callbackMap.get(callback).get(0),
+ ((VdcOperationCallback)
callbackEntry.getKey()).onSuccess(callbackEntry.getValue().get(0),
queryResult.get(0));
}
}
@@ -227,11 +227,11 @@
public void onFailure(final Throwable exception) {
Map<VdcOperationCallback<?, ?>, List<VdcOperation<?,
?>>> callbackMap =
getCallbackMap(actions.get(actionType));
- for (VdcOperationCallback<?, ?> callback:
callbackMap.keySet()) {
- if (callback instanceof VdcOperationCallbackList) {
- ((VdcOperationCallbackList)
callback).onFailure(callbackMap.get(callback), exception);
+ for (Map.Entry<VdcOperationCallback<?, ?>,
List<VdcOperation<?, ?>>> callbackEntry: callbackMap.entrySet()) {
+ if (callbackEntry.getKey() instanceof
VdcOperationCallbackList) {
+ ((VdcOperationCallbackList)
callbackEntry.getKey()).onFailure(callbackEntry.getValue(), exception);
} else {
- ((VdcOperationCallback)
callback).onFailure(callbackMap.get(callback).get(0),
+ ((VdcOperationCallback)
callbackEntry.getKey()).onFailure(callbackEntry.getValue().get(0),
exception);
}
}
@@ -241,14 +241,14 @@
public void onSuccess(final ArrayList<VdcReturnValueBase>
result) {
Map<VdcOperationCallback<?, ?>, List<VdcOperation<?,
?>>> callbackMap =
getCallbackMap(actions.get(actionType));
- for (VdcOperationCallback<?, ?> callback:
callbackMap.keySet()) {
+ for (Map.Entry<VdcOperationCallback<?, ?>,
List<VdcOperation<?, ?>>> callbackEntry: callbackMap.entrySet()) {
List<VdcReturnValueBase> actionResult =
(List<VdcReturnValueBase>)
-
getOperationResult(callbackMap.get(callback), allActionOperations, result);
- if (callback instanceof VdcOperationCallbackList) {
- ((VdcOperationCallbackList)
callback).onSuccess(callbackMap.get(callback),
+
getOperationResult(callbackEntry.getValue(), allActionOperations, result);
+ if (callbackEntry.getKey() instanceof
VdcOperationCallbackList) {
+ ((VdcOperationCallbackList)
callbackEntry.getKey()).onSuccess(callbackEntry.getValue(),
actionResult);
} else {
- ((VdcOperationCallback)
callback).onSuccess(callbackMap.get(callback).get(0),
+ ((VdcOperationCallback)
callbackEntry.getKey()).onSuccess(callbackEntry.getValue().get(0),
actionResult.get(0));
}
}
--
To view, visit http://gerrit.ovirt.org/21618
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifaff47aaba96f6fb7a115af63c239b63077a4632
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
