Merge a208f29 into 32c1c6e

x-stream · Jan 30, 2018 · b1f2505 · b1f2505
2 parents 32c1c6e + a208f29
commit b1f2505
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/xstream/src/java/com/thoughtworks/xstream/core/TreeUnmarshaller.java b/xstream/src/java/com/thoughtworks/xstream/core/TreeUnmarshaller.java
@@ -71,7 +71,6 @@ protected Object convert(final Object parent, final Class<?> type, final Convert
         try {
             types.push(type);
             final Object result = converter.unmarshal(reader, this);
-            types.popSilently();
             return result;
         } catch (final ConversionException conversionException) {
             addInformationTo(conversionException, type, converter, parent);
@@ -80,6 +79,8 @@ protected Object convert(final Object parent, final Class<?> type, final Convert
             final ConversionException conversionException = new ConversionException(e);
             addInformationTo(conversionException, type, converter, parent);
             throw conversionException;
+        } finally {
+            types.popSilently();
         }
     }