Author: oheger
Date: Sun Jan 24 20:53:40 2016
New Revision: 1726562
URL: http://svn.apache.org/viewvc?rev=1726562&view=rev
Log:
[CONFIGURATION-615] Adapted constructor of MapConfiguration.
Merged the change from CONFIGURATION-557 from version 1.10 to 2.0 branch.
This allows using MapConfiguration in the same way as in Configuration
1.7 and earlier.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java?rev=1726562&r1=1726561&r2=1726562&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java
Sun Jan 24 20:53:40 2016
@@ -103,9 +103,9 @@ public class MapConfiguration extends Ab
*
* @param map the map
*/
- public MapConfiguration(Map<String, Object> map)
+ public MapConfiguration(Map<String, ?> map)
{
- this.map = map;
+ this.map = (Map<String, Object>) map;
}
/**
