svn commit: r1437269 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/util/StringMap.java

[sahoo]

Author: sahoo
Date: Wed Jan 23 04:39:21 2013
New Revision: 1437269

URL: http://svn.apache.org/viewvc?rev=1437269&view=rev
Log:
Felix-3852: InstallBundle throws ClassCastException: java.util.jar.Attributes 
cannot be cast to java.lang.String

Modified:
    
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/StringMap.java

Modified: 
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/StringMap.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/StringMap.java?rev=1437269&r1=1437268&r2=1437269&view=diff
==============================================================================
--- 
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/StringMap.java
 (original)
+++ 
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/StringMap.java
 Wed Jan 23 04:39:21 2013
@@ -40,7 +40,10 @@ public class StringMap extends AbstractM
 
     public StringMap(Map map, boolean caseSensitive)
     {
-        putAll(map);
+        for (Entry e : (Set<Entry>)map.entrySet())
+        {
+            put(e.getKey().toString(), e.getValue());
+        }
     }
 
     @Override
@@ -82,15 +85,6 @@ public class StringMap extends AbstractM
     }
 
     @Override
-    public void putAll(Map<? extends String, ? extends Object> map)
-    {
-        for (Map.Entry<? extends String, ? extends Object> e : map.entrySet())
-        {
-            put(e.getKey(), e.getValue());
-        }
-    }
-
-    @Override
     public Object remove(Object arg0)
     {
         KeyValueEntry kve = m_map.remove(toUpperCase(arg0.toString()));