[JENKINS-49054] TreeUnmarshaller.convert could leave behind a corrupt…

…ed type stack.
x-stream · Jan 19, 2018 · 7ef77cf · 7ef77cf
1 parent d29c62c
commit 7ef77cf
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/xstream/src/java/com/thoughtworks/xstream/core/TreeUnmarshaller.java b/xstream/src/java/com/thoughtworks/xstream/core/TreeUnmarshaller.java
@@ -68,18 +68,18 @@ public Object convertAnother(final Object parent, Class<?> type, Converter conve
     }
 
     protected Object convert(final Object parent, final Class<?> type, final Converter converter) {
+        types.push(type);
         try {
-            types.push(type);
-            final Object result = converter.unmarshal(reader, this);
-            types.popSilently();
-            return result;
+            return converter.unmarshal(reader, this);
         } catch (final ConversionException conversionException) {
             addInformationTo(conversionException, type, converter, parent);
             throw conversionException;
         } catch (final RuntimeException e) {
             final ConversionException conversionException = new ConversionException(e);
             addInformationTo(conversionException, type, converter, parent);
             throw conversionException;
+        } finally {
+            types.popSilently();
         }
     }