From 68c76e6738f30a5f2f00646e9511a7d3257c9ace Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Tue, 31 Jul 2012 00:10:25 +0200
Subject: [PATCH] try harder to load the default mapping from the class load,
 and if we fail, just use the default value (which people really never
 change).

---
 .../index/mapper/MapperService.java           | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index f9e0ac1cbb5..8207a251ac7 100644
--- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -114,6 +114,9 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
             } catch (FailedToResolveConfigException e) {
                 // not there, default to the built in one
                 defaultMappingUrl = indexSettings.getClassLoader().getResource("org/elasticsearch/index/mapper/default-mapping.json");
+                if (defaultMappingUrl == null) {
+                    defaultMappingUrl = MapperService.class.getClassLoader().getResource("org/elasticsearch/index/mapper/default-mapping.json");
+                }
             }
         } else {
             try {
@@ -128,10 +131,18 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
             }
         }
 
-        try {
-            defaultMappingSource = Streams.copyToString(new InputStreamReader(defaultMappingUrl.openStream(), Charsets.UTF_8));
-        } catch (IOException e) {
-            throw new MapperException("Failed to load default mapping source from [" + defaultMappingLocation + "]", e);
+        if (defaultMappingUrl == null) {
+            logger.info("failed to find default-mapping.json in the classpath, using the default template");
+            defaultMappingSource = "{\n" +
+                    "    \"_default_\":{\n" +
+                    "    }\n" +
+                    "}";
+        } else {
+            try {
+                defaultMappingSource = Streams.copyToString(new InputStreamReader(defaultMappingUrl.openStream(), Charsets.UTF_8));
+            } catch (IOException e) {
+                throw new MapperException("Failed to load default mapping source from [" + defaultMappingLocation + "]", e);
+            }
         }
 
         logger.debug("using dynamic[{}], default mapping: default_mapping_location[{}], loaded_from[{}] and source[{}]", dynamic, defaultMappingLocation, defaultMappingUrl, defaultMappingSource);