parent/child field data is an exception to the rule, because it is ba…

…sed on two fields...
jpountz · Jul 23, 2015 · 948da82 · 948da82
1 parent 2d775c3
commit 948da82
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
@@ -131,7 +131,15 @@ public void close() throws ElasticsearchException {
                 }
             };
         } else {
-            return super.load(context);
+            try {
+                return cache.load(context, this);
+            } catch (Throwable e) {
+                if (e instanceof ElasticsearchException) {
+                    throw (ElasticsearchException) e;
+                } else {
+                    throw new ElasticsearchException(e.getMessage(), e);
+                }
+            }
         }
     }