Merge pull request #20041 from tsouza/fix/issue-19142

Thiago Souza · web-flow · commit 8281a3ce7900 · 2016-08-18T17:31:16.000-03:00
Make exception message more descriptive
diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java b/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java
@@ -80,7 +80,7 @@ public Map<String, BaseInnerHits> getInnerHits() {
     public void addInnerHitDefinition(BaseInnerHits innerHit) {
         if (innerHits.containsKey(innerHit.getName())) {
             throw new IllegalArgumentException("inner_hit definition with the name [" + innerHit.getName() +
-                    "] already exists. Use a different inner_hit name");
+                    "] already exists. Use a different inner_hit name or define one explicitly");
         }
 
         innerHits.put(innerHit.getName(), innerHit);

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public Map<String, BaseInnerHits> getInnerHits() {`
`80`	`80`	`public void addInnerHitDefinition(BaseInnerHits innerHit) {`
`81`	`81`	`if (innerHits.containsKey(innerHit.getName())) {`
`82`	`82`	`throw new IllegalArgumentException("inner_hit definition with the name [" + innerHit.getName() +`
`83`		`- "] already exists. Use a different inner_hit name");`
	`83`	`+ "] already exists. Use a different inner_hit name or define one explicitly");`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`innerHits.put(innerHit.getName(), innerHit);`