From 403930d448efa488a3e27b193a7765791d310a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20B=C3=A1lint?= <szabo.balint@virgo.hu>
Date: Mon, 24 Mar 2014 12:06:01 +0100
Subject: [PATCH] DATAES-74 NPE in MappingElasticsearchEntityInformation

---
 .../core/mapping/SimpleElasticsearchPersistentProperty.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java b/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java
index ca80d0817..ea1765ec1 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java
@@ -55,7 +55,7 @@ public class SimpleElasticsearchPersistentProperty extends
 
 	@Override
 	public boolean isIdProperty() {
-		return super.isIdProperty() || field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false;
+		return super.isIdProperty() || (field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false);
 	}
 
 	@Override