From bb9c7172b0ad67d6244fc0574df429318d63068d Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Mon, 24 Dec 2012 00:04:12 -0800
Subject: [PATCH] add mappings even on failure to parse since we add them
 internally to the compound mappers, we need to publish the fact, otherwise,
 for example, the codec won't find the relevant one based on the global mapper
 service

---
 .../index/mapper/DocumentMapper.java           | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
index 35dd501a2bc..1761610faf4 100644
--- a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
@@ -497,9 +497,11 @@ public class DocumentMapper implements ToXContent {
             // fire up any new mappers if exists
             if (!context.newFieldMappers().mappers.isEmpty()) {
                 addFieldMappers(context.newFieldMappers().mappers);
+                context.newFieldMappers().mappers.clear();
             }
             if (!context.newObjectMappers().mappers.isEmpty()) {
                 addObjectMappers(context.newObjectMappers().mappers);
+                context.newObjectMappers().mappers.clear();
             }
 
             for (RootMapper rootMapper : rootMappersOrdered) {
@@ -509,8 +511,20 @@ public class DocumentMapper implements ToXContent {
             for (RootMapper rootMapper : rootMappersOrdered) {
                 rootMapper.validate(context);
             }
-        } catch (IOException e) {
-            throw new MapperParsingException("Failed to parse", e);
+        } catch (Throwable e) {
+            // we have to fire up any new mappers even on a failure, because they
+            // have been added internally to each compound mapper...
+            // ... we have no option to "rollback" a change, which is very tricky in our copy on change system...
+            if (!context.newFieldMappers().mappers.isEmpty()) {
+                addFieldMappers(context.newFieldMappers().mappers);
+                context.newFieldMappers().mappers.clear();
+            }
+            if (!context.newObjectMappers().mappers.isEmpty()) {
+                addObjectMappers(context.newObjectMappers().mappers);
+                context.newObjectMappers().mappers.clear();
+            }
+
+            throw new MapperParsingException("failed to parse", e);
         } finally {
             // only close the parser when its not provided externally
             if (source.parser() == null && parser != null) {