Updated Branches: refs/heads/master bf30dbc24 -> 066ff97b0
Commit for https://reviews.apache.org/r/7191/ Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/066ff97b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/066ff97b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/066ff97b Branch: refs/heads/master Commit: 066ff97b0132836cde3b99988563cb929088be45 Parents: bf30dbc Author: Kelven Yang <[email protected]> Authored: Thu Sep 20 15:46:04 2012 -0700 Committer: Kelven Yang <[email protected]> Committed: Thu Sep 20 15:46:40 2012 -0700 ---------------------------------------------------------------------- .../VmwareSecondaryStorageContextFactory.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/066ff97b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java index fce66a9..fc298c8 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java @@ -17,6 +17,7 @@ package com.cloud.storage.resource; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import com.cloud.hypervisor.vmware.util.VmwareContext; @@ -60,10 +61,11 @@ public class VmwareSecondaryStorageContextFactory { public static void invalidate(VmwareContext context) { synchronized(s_contextMap) { - for(Map.Entry<String, VmwareContext> entry : s_contextMap.entrySet()) { - if(entry.getValue() == context) { - s_contextMap.remove(entry.getKey()); - } + for(Iterator<Map.Entry<String, VmwareContext>> entryIter = s_contextMap.entrySet().iterator(); entryIter.hasNext();) { + Map.Entry<String, VmwareContext> entry = entryIter.next(); + if(entry.getValue() == context) { + entryIter.remove(); + } } }
