You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ke...@apache.org on 2007/05/15 09:21:14 UTC
svn commit: r538075 - in
/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2:
builder/BuilderUtil.java util/MultipleEntryHashMap.java
Author: keithc
Date: Tue May 15 00:21:13 2007
New Revision: 538075
URL: http://svn.apache.org/viewvc?view=rev&rev=538075
Log:
Fix for Axis2-2662. Avoid modifying the map while iterating.
Modified:
webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java
Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?view=diff&rev=538075&r1=538074&r2=538075
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java (original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java Tue May 15 00:21:13 2007
@@ -91,7 +91,9 @@
while (requestParamMapIter.hasNext()) {
String key = (String) requestParamMapIter.next();
String value = (String) requestParameterMap.get(key);
- soapFactory.createOMElement(key, null, bodyFirstChild).setText(value);
+ if (value != null) {
+ soapFactory.createOMElement(key, null, bodyFirstChild).setText(value);
+ }
}
}
Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java?view=diff&rev=538075&r1=538074&r2=538075
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java (original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java Tue May 15 00:21:13 2007
@@ -4,6 +4,8 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.Hashtable;
+import java.io.Serializable;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -28,7 +30,7 @@
private Map table;
public MultipleEntryHashMap() {
- this.table = new HashMap(1);
+ this.table = new Hashtable(1);
}
/**
@@ -39,12 +41,12 @@
*/
public Object get(Object key) {
ArrayList list = (ArrayList) table.get(key);
- if (list != null) {
+ if (list != null && list.size() > 0) {
Object o = list.get(0);
list.remove(0);
- if (list.size() == 0) {
- table.remove(key);
- }
+// if (list.size() == 0) {
+// table.remove(key);
+// }
return o;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org