Minor improvement to handling of JsonGenerator.close() on exception case

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -9,14 +9,12 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.fasterxml.jackson.annotation.*;
-
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.CharacterEscapes;
 import com.fasterxml.jackson.core.io.SegmentedStringWriter;
 import com.fasterxml.jackson.core.type.ResolvedType;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.core.util.*;
-
 import com.fasterxml.jackson.databind.cfg.BaseSettings;
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;
 import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
@@ -2838,6 +2836,10 @@ protected final void _configAndWriteValue(JsonGenerator jgen, Object value)
              * will not mask exception that is pending)
              */
             if (!closed) {
+                /* 04-Mar-2014, tatu: But! Let's try to prevent auto-closing of
+                 *    structures, which typically causes more damage.
+                 */
+                jgen.disable(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT);
                 try {
                     jgen.close();
                 } catch (IOException ioe) { }
@@ -2869,6 +2871,9 @@ protected final void _configAndWriteValue(JsonGenerator jgen, Object value, Clas
             jgen.close();
         } finally {
             if (!closed) {
+                // 04-Mar-2014, tatu: But! Let's try to prevent auto-closing of
+                //    structures, which typically causes more damage.
+                jgen.disable(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT);
                 try {
                     jgen.close();
                 } catch (IOException ioe) { }
@@ -2897,6 +2902,9 @@ private final void _configAndWriteCloseable(JsonGenerator jgen, Object value, Se
              * been closed
              */
             if (jgen != null) {
+                // 04-Mar-2014, tatu: But! Let's try to prevent auto-closing of
+                //    structures, which typically causes more damage.
+                jgen.disable(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT);
                 try {
                     jgen.close();
                 } catch (IOException ioe) { }

src/main/java/com/fasterxml/jackson/databind/ObjectWriter.java

@@ -774,8 +774,7 @@ protected void _verifySchemaType(FormatSchema schema)
      * Method called to configure the generator as necessary and then
      * call write functionality
      */
-    protected final void _configAndWriteValue(JsonGenerator jgen, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
+    protected final void _configAndWriteValue(JsonGenerator jgen, Object value) throws IOException
     {
         _configureJsonGenerator(jgen);
         // [JACKSON-282]: consider Closeable
@@ -797,6 +796,10 @@ protected final void _configAndWriteValue(JsonGenerator jgen, Object value)
              * will not mask exception that is pending)
              */
             if (!closed) {
+                /* 04-Mar-2014, tatu: But! Let's try to prevent auto-closing of
+                 *    structures, which typically causes more damage.
+                 */
+                jgen.disable(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT);
                 try {
                     jgen.close();
                 } catch (IOException ioe) { }
@@ -829,6 +832,10 @@ private final void _writeCloseable(JsonGenerator jgen, Object value, Serializati
              * been closed
              */
             if (jgen != null) {
+                /* 04-Mar-2014, tatu: But! Let's try to prevent auto-closing of
+                 *    structures, which typically causes more damage.
+                 */
+                jgen.disable(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT);
                 try {
                     jgen.close();
                 } catch (IOException ioe) { }