DATAES-74 NPE in MappingElasticsearchEntityInformation

szabobalint-virgo · szabobalint-virgo · commit 403930d448ef · 2014-03-24T12:06:01.000+01:00
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
@@ -55,7 +55,7 @@ public String getFieldName() {
 
 	@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

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public String getFieldName() {`
`55`	`55`
`56`	`56`	`@Override`
`57`	`57`	`public boolean isIdProperty() {`
`58`		`- return super.isIdProperty() \|\| field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false;`
	`58`	`+ return super.isIdProperty() \|\| (field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`