Merge pull request #11583 from bleskes/mapper_exception_unwrap

Recovery: Fix MapperException detection during translog ops replay
elastic · Jun 10, 2015 · 650950c · 650950c
2 parents 831cfa5 + e9d275d
commit 650950c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
@@ -306,7 +306,8 @@ public void messageReceived(final RecoveryTranslogOperationsRequest request, fin
                 try {
                     recoveryStatus.indexShard().performBatchRecovery(request.operations());
                 } catch (TranslogRecoveryPerformer.BatchOperationException exception) {
-                    if (ExceptionsHelper.unwrapCause(exception) instanceof MapperException == false) {
+                    MapperException mapperException = (MapperException) ExceptionsHelper.unwrap(exception, MapperException.class);
+                    if (mapperException == null) {
                         throw exception;
                     }
                     // in very rare cases a translog replay from primary is processed before a mapping update on this node