From 68a332bc5ade481ea1019cd61a4a9dfd03bfe7aa Mon Sep 17 00:00:00 2001
From: Marty Schoch <marty.schoch@gmail.com>
Date: Mon, 1 Sep 2014 14:36:46 -0400
Subject: [PATCH] fix broken test crashing

---
 mapping_index.go | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/mapping_index.go b/mapping_index.go
index 91569e05..20bbefb4 100644
--- a/mapping_index.go
+++ b/mapping_index.go
@@ -240,8 +240,25 @@ func (im *IndexMapping) UnmarshalJSON(data []byte) error {
 	im.cache = registry.NewCache()
 
 	im.CustomAnalysis = newCustomAnalysis()
-	if im.CustomAnalysis != nil {
-		im.CustomAnalysis = tmp.CustomAnalysis
+	if tmp.CustomAnalysis != nil {
+		if tmp.CustomAnalysis.CharFilters != nil {
+			im.CustomAnalysis.CharFilters = tmp.CustomAnalysis.CharFilters
+		}
+		if tmp.CustomAnalysis.Tokenizers != nil {
+			im.CustomAnalysis.Tokenizers = tmp.CustomAnalysis.Tokenizers
+		}
+		if tmp.CustomAnalysis.TokenMaps != nil {
+			im.CustomAnalysis.TokenMaps = tmp.CustomAnalysis.TokenMaps
+		}
+		if tmp.CustomAnalysis.TokenFilters != nil {
+			im.CustomAnalysis.TokenFilters = tmp.CustomAnalysis.TokenFilters
+		}
+		if tmp.CustomAnalysis.Analyzers != nil {
+			im.CustomAnalysis.Analyzers = tmp.CustomAnalysis.Analyzers
+		}
+		if tmp.CustomAnalysis.DateTimeParsers != nil {
+			im.CustomAnalysis.DateTimeParsers = tmp.CustomAnalysis.DateTimeParsers
+		}
 	}
 
 	im.TypeField = defaultTypeField