Merge branch 'master' of github.com:SpringSource/spring-data-keyvalue

spring-data-riak/pom.xml

@@ -126,11 +126,11 @@
         <groupId>com.springsource.bundlor</groupId>
         <artifactId>com.springsource.bundlor.maven</artifactId>
       </plugin>
+      <!-- For running Groovy/Spock tests -->
       <plugin>
         <groupId>org.spockframework</groupId>
         <artifactId>spock-maven</artifactId>
       </plugin>
-      <!-- For running Groovy/Spock tests -->
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <configuration>

spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakTemplate.java

@@ -896,7 +896,12 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe
         }
       }
     }
-    return (null != obj ? (T) obj.get() : null);
+
+    if (null != obj && obj.getClass() == requiredType) {
+      return (T) obj.get();
+    } else {
+      return null;
+    }
   }
 
 }