From 066ff97b0132836cde3b99988563cb929088be45 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven.yang@citrix.com>
Date: Thu, 20 Sep 2012 15:46:04 -0700
Subject: [PATCH] Commit for https://reviews.apache.org/r/7191/

---
 .../resource/VmwareSecondaryStorageContextFactory.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 fce66a97539..fc298c895c8 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();
+                }
 			}
 		}