This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.resourceresolver-mock-1.1.10 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit a35c01730590d6ea1e90144bcea53f95c758f5b5 Author: Stefan Seifert <[email protected]> AuthorDate: Mon May 18 22:34:43 2015 +0000 SLING-4723 resourceresolver-mock: Make sure type conversion on write is applied on putAll method as well git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock@1680117 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/testing/resourceresolver/MockValueMap.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java index 11c1ba0..b18b9ea 100644 --- a/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java +++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java @@ -49,7 +49,7 @@ public class MockValueMap extends ValueMapDecorator { } public MockValueMap(Resource resource, Map<String,Object> map) { - super(convertForWrite(map)); + super(convertForWriteAll(map)); this.resource = resource; } @@ -109,7 +109,7 @@ public class MockValueMap extends ValueMapDecorator { @SuppressWarnings("unchecked") @Override public void putAll(Map<? extends String, ?> map) { - super.putAll((Map<? extends String, ?>)convertForWrite(map)); + super.putAll((Map<? extends String, ?>)convertForWriteAll((Map<String, Object>)map)); } private static Object convertForWrite(Object value) { @@ -130,7 +130,7 @@ public class MockValueMap extends ValueMapDecorator { return value; } - private static Map<String, Object> convertForWrite(Map<String, Object> map) { + private static Map<String, Object> convertForWriteAll(Map<String, Object> map) { Map<String,Object> newMap = new HashMap<String, Object>(); for (Map.Entry<String, Object> entry : map.entrySet()) { newMap.put(entry.getKey(), convertForWrite(entry.getValue())); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
