svn commit: r1647846 - in /sling/trunk/testing/mocks/resourceresolver-mock/src: main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java

[rombert]

Author: rombert
Date: Wed Dec 24 21:19:56 2014
New Revision: 1647846

URL: http://svn.apache.org/r1647846
Log:
SLING-4265 - Tolerate a null class argument passed to
MockValueMap.get(String, Class<T>)

Modified:
    
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
    
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java

Modified: 
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java?rev=1647846&r1=1647845&r2=1647846&view=diff
==============================================================================
--- 
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
 (original)
+++ 
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
 Wed Dec 24 21:19:56 2014
@@ -95,6 +95,9 @@ public class MockValueMap extends ValueM
                 return null;
             }
         }
+        else if ( type == null ) {
+            return (T) super.get(name);
+        }
         return super.get(name, type);
     }
     

Modified: 
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java?rev=1647846&r1=1647845&r2=1647846&view=diff
==============================================================================
--- 
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
 (original)
+++ 
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
 Wed Dec 24 21:19:56 2014
@@ -214,4 +214,12 @@ public class SlingCrudResourceResolverTe
         assertNull(resource);
     }
 
+    @Test
+    public void testGetConvertedToNullType() {
+        Resource resource1 = resourceResolver.getResource(testRoot.getPath() + 
"/node1");
+        Object propValue = 
ResourceUtil.getValueMap(resource1).get("stringProp", null);
+
+        assertEquals(STRING_VALUE, propValue);
+    }
+
 }