From eb5638b45aab45adf358e281b64349914012882f Mon Sep 17 00:00:00 2001
From: Michael Hunger <github@jexp.de>
Date: Mon, 24 Feb 2014 16:01:59 +0100
Subject: [PATCH] DATAGRAPH-340 3.0.GA Release

* update to Spring Data Commons 1.7.0.RELEASE
* temporarily disable strict checking until fixed in SDC
---
 pom.xml                                                        | 2 +-
 .../data/neo4j/support/mapping/Neo4jMappingContext.java        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 670fa4ef6..ed3124ae7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-neo4j</dist.id>
-		<springdata.commons>1.7.0.BUILD-SNAPSHOT</springdata.commons>
+		<springdata.commons>1.7.0.RELEASE</springdata.commons>
 
         <!-- Neo4j 2.0 now requires JDK 7 as a min -->
         <source.level>1.7</source.level>
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jMappingContext.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jMappingContext.java
index f38eb7201..3913e37e1 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jMappingContext.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4jMappingContext.java
@@ -97,7 +97,7 @@ public class Neo4jMappingContext extends AbstractMappingContext<Neo4jPersistentE
     @Override
     public void initialize() {
         super.initialize();
-        setStrict(true);
+//TODO re-enable after SDC update setStrict(true);
     }
 
     private boolean isRelationshipEntityType(Class<?> type) {
@@ -161,6 +161,7 @@ public class Neo4jMappingContext extends AbstractMappingContext<Neo4jPersistentE
         try {
             final Neo4jPersistentEntityImpl<?> entity = getPersistentEntity(type);
             if (entity == null) annotationCheckCache.put(type, type);
+            else if (!shouldCreatePersistentEntityFor(ClassTypeInformation.from(type))) annotationCheckCache.put(type, type);
             else if (entity.isNodeEntity()) annotationCheckCache.put(type, NodeEntity.class);
             else if (entity.isRelationshipEntity()) annotationCheckCache.put(type, RelationshipEntity.class);
             else annotationCheckCache.put(type, type);