avoid ConcurrentModificationException when iterating attribute names (SPR-7557)

jhoeller · jhoeller · commit aac2de9221f0 · 2010-10-01T22:27:34.000Z
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.Vector;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletInputStream;
@@ -284,7 +285,7 @@ public Object getAttribute(String name) {
 
 	public Enumeration<String> getAttributeNames() {
 		checkActive();
-		return Collections.enumeration(this.attributes.keySet());
+		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
 	public String getCharacterEncoding() {
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpSession.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
 package org.springframework.mock.web;
 
 import java.io.Serializable;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Vector;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionBindingEvent;
@@ -137,7 +137,7 @@ public Object getValue(String name) {
 	}
 
 	public Enumeration<String> getAttributeNames() {
-		return Collections.enumeration(this.attributes.keySet());
+		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
 	public String[] getValueNames() {
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockPageContext.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockPageContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 package org.springframework.mock.web;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Vector;
 import javax.el.ELContext;
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
@@ -247,7 +247,7 @@ else if (getAttribute(name, APPLICATION_SCOPE) != null) {
 	}
 
 	public Enumeration<String> getAttributeNames() {
-		return Collections.enumeration(this.attributes.keySet());
+		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java b/org.springframework.test/src/main/java/org/springframework/mock/web/MockServletContext.java
@@ -29,6 +29,7 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.Vector;
 import javax.activation.FileTypeMap;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
@@ -323,7 +324,7 @@ public Object getAttribute(String name) {
 	}
 
 	public Enumeration<String> getAttributeNames() {
-		return Collections.enumeration(this.attributes.keySet());
+		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
 	public void setAttribute(String name, Object value) {
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java b/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,10 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.Vector;
+import javax.activation.FileTypeMap;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletRequestDispatcher;
-import javax.activation.FileTypeMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -209,7 +210,7 @@ public Object getAttribute(String name) {
 	}
 
 	public Enumeration<String> getAttributeNames() {
-		return Collections.enumeration(this.attributes.keySet());
+		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
 	public void setAttribute(String name, Object value) {
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.Vector;
 import javax.portlet.PortalContext;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletMode;
@@ -327,7 +328,7 @@ public Object getAttribute(String name) {
 
 	public Enumeration<String> getAttributeNames() {
 		checkActive();
-		return Collections.enumeration(this.attributes.keySet());
+		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
 	public void setParameters(Map<String, String[]> parameters) {
diff --git a/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java b/org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Vector;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletSession;
 import javax.servlet.http.HttpSessionBindingEvent;
@@ -91,15 +92,15 @@ else if (scope == PortletSession.APPLICATION_SCOPE) {
 	}
 
 	public Enumeration<String> getAttributeNames() {
-		return Collections.enumeration(this.portletAttributes.keySet());
+		return new Vector<String>(this.portletAttributes.keySet()).elements();
 	}
 
 	public Enumeration<String> getAttributeNames(int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
-			return Collections.enumeration(this.portletAttributes.keySet());
+			return new Vector<String>(this.portletAttributes.keySet()).elements();
 		}
 		else if (scope == PortletSession.APPLICATION_SCOPE) {
-			return Collections.enumeration(this.applicationAttributes.keySet());
+			return new Vector<String>(this.applicationAttributes.keySet()).elements();
 		}
 		return null;
 	}

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import java.util.LinkedHashSet;`
`30`	`30`	`import java.util.Map;`
`31`	`31`	`import java.util.Set;`
	`32`	`+import java.util.Vector;`
`32`	`33`	`import javax.activation.FileTypeMap;`
`33`	`34`	`import javax.servlet.RequestDispatcher;`
`34`	`35`	`import javax.servlet.Servlet;`
`@@ -323,7 +324,7 @@ public Object getAttribute(String name) {`
`323`	`324`	`}`
`324`	`325`
`325`	`326`	`public Enumeration<String> getAttributeNames() {`
`326`		`- return Collections.enumeration(this.attributes.keySet());`
	`327`	`+ return new Vector<String>(this.attributes.keySet()).elements();`
`327`	`328`	`}`
`328`	`329`
`329`	`330`	`public void setAttribute(String name, Object value) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2009 the original author or authors.`
	`2`	`+ * Copyright 2002-2010 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -21,6 +21,7 @@`
`21`	`21`	`import java.util.HashMap;`
`22`	`22`	`import java.util.Iterator;`
`23`	`23`	`import java.util.Map;`
	`24`	`+import java.util.Vector;`
`24`	`25`	`import javax.portlet.PortletContext;`
`25`	`26`	`import javax.portlet.PortletSession;`
`26`	`27`	`import javax.servlet.http.HttpSessionBindingEvent;`
`@@ -91,15 +92,15 @@ else if (scope == PortletSession.APPLICATION_SCOPE) {`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`public Enumeration<String> getAttributeNames() {`
`94`		`- return Collections.enumeration(this.portletAttributes.keySet());`
	`95`	`+ return new Vector<String>(this.portletAttributes.keySet()).elements();`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`public Enumeration<String> getAttributeNames(int scope) {`
`98`	`99`	`if (scope == PortletSession.PORTLET_SCOPE) {`
`99`		`- return Collections.enumeration(this.portletAttributes.keySet());`
	`100`	`+ return new Vector<String>(this.portletAttributes.keySet()).elements();`
`100`	`101`	`}`
`101`	`102`	`else if (scope == PortletSession.APPLICATION_SCOPE) {`
`102`		`- return Collections.enumeration(this.applicationAttributes.keySet());`
	`103`	`+ return new Vector<String>(this.applicationAttributes.keySet()).elements();`
`103`	`104`	`}`
`104`	`105`	`return null;`
`105`	`106`	`}`