From d1a2892ee5309be621f2c3ea41b83163589e78cf Mon Sep 17 00:00:00 2001
From: Nicki Watt <nicki.watt@opencredo.com>
Date: Mon, 12 Aug 2013 11:45:04 +0100
Subject: [PATCH] DATAGRAPH-311 : Reverted to using existing
 ClassTypeInformation getProperty method and not newly requested fromTypeOf
 method

---
 pom.xml                                                      | 2 +-
 .../neo4j/support/conversion/ResultColumnValueExtractor.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index deac96288..7cc143398 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 		<project.type>multi</project.type>
 		<dist.id>spring-data-neo4j</dist.id>
 		
-		<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
+		<springdata.commons>1.6.0.RC1</springdata.commons>
 		<neo4j.version>1.9</neo4j.version>
 
 		<neo4j.spatial.version>0.11-neo4j-1.9</neo4j.spatial.version>
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/ResultColumnValueExtractor.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/ResultColumnValueExtractor.java
index 02268d9ce..e1e5dc46d 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/ResultColumnValueExtractor.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/ResultColumnValueExtractor.java
@@ -38,8 +38,9 @@ public class ResultColumnValueExtractor {
         IllegalAccessException,
         InvocationTargetException {
         ResultColumn column = field.getAnnotation(ResultColumn.class);
-        TypeInformation<?> returnType = ClassTypeInformation.fromTypeOf(field);
-        return extractFromAccessibleObject(column,returnType);
+        TypeInformation<?> classInfo = ClassTypeInformation.from(field.getDeclaringClass());
+        TypeInformation<?> fieldInfo = classInfo.getProperty(field.getName());
+        return extractFromAccessibleObject(column,fieldInfo);
     }
 
     public Object extractFromMethod(Method method) throws ClassNotFoundException,