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] 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;
+    }
   }
 
 }