svn commit: r538076 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: builder/BuilderUtil.java util/MultipleEntryHashMap.java

[keithc]

Author: keithc
Date: Tue May 15 00:24:11 2007
New Revision: 538076

URL: http://svn.apache.org/viewvc?view=rev&rev=538076
Log:
Fix for Axis2-2662


Modified:
    
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
    
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java

Modified: 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?view=diff&rev=538076&r1=538075&r2=538076
==============================================================================
--- 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
 Tue May 15 00:24:11 2007
@@ -96,7 +96,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/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java?view=diff&rev=538076&r1=538075&r2=538076
==============================================================================
--- 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java
 Tue May 15 00:24:11 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]