From 93229806273250657a7bd0754c7f0c3c2b03d129 Mon Sep 17 00:00:00 2001
From: "J. Brisbin" <jon@jbrisbin.com>
Date: Fri, 26 Nov 2010 14:12:26 -0600
Subject: [PATCH 1/3] Turned off tests

---
 spring-data-riak/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-data-riak/pom.xml b/spring-data-riak/pom.xml
index 120963fd0..a6813e788 100644
--- a/spring-data-riak/pom.xml
+++ b/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>
@@ -168,6 +168,7 @@
           </dependency>
         </dependencies>
       </plugin>
+      -->
 
     </plugins>
   </build>

From 35c6353ee36d3206cca816784620dd275098e6d6 Mon Sep 17 00:00:00 2001
From: "J. Brisbin" <jon@jbrisbin.com>
Date: Mon, 29 Nov 2010 08:27:30 -0600
Subject: [PATCH 2/3] Minor fix for NPE in some cases

---
 .../org/springframework/data/riak/core/RiakTemplate.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakTemplate.java b/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakTemplate.java
index ef1cbcda7..d7c5f5287 100644
--- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakTemplate.java
+++ b/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;
+    }
   }
 
 }

From f8e471cf34d72e911bf6067a780b0077829dcec8 Mon Sep 17 00:00:00 2001
From: "J. Brisbin" <jon@jbrisbin.com>
Date: Mon, 29 Nov 2010 08:29:49 -0600
Subject: [PATCH 3/3] Turned tests on now that Riak is running on build box

---
 spring-data-riak/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-data-riak/pom.xml b/spring-data-riak/pom.xml
index a6813e788..5b352a9ea 100644
--- a/spring-data-riak/pom.xml
+++ b/spring-data-riak/pom.xml
@@ -126,7 +126,7 @@
         <groupId>com.springsource.bundlor</groupId>
         <artifactId>com.springsource.bundlor.maven</artifactId>
       </plugin>
-      <!-- For running Groovy/Spock tests
+      <!-- For running Groovy/Spock tests -->
       <plugin>
         <groupId>org.spockframework</groupId>
         <artifactId>spock-maven</artifactId>
@@ -168,7 +168,6 @@
           </dependency>
         </dependencies>
       </plugin>
-      -->
 
     </plugins>
   </build>