close IOContexts (#427)

Author: pjfanning

csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvGenerator.java

@@ -504,17 +504,20 @@ public final void flush() throws IOException {
     @Override
     public void close() throws IOException
     {
-        super.close();
+        if (!isClosed()) {
+            super.close();
 
-        // Let's mark row as closed, if we had any...
-        finishRow();
-        
-        // Write the header if necessary, occurs when no rows written
-        if (_handleFirstLine) {
-            _handleFirstLine();
+            // Let's mark row as closed, if we had any...
+            finishRow();
+
+            // Write the header if necessary, occurs when no rows written
+            if (_handleFirstLine) {
+                _handleFirstLine();
+            }
+            _writer.close(_ioContext.isResourceManaged() || isEnabled(JsonGenerator.Feature.AUTO_CLOSE_TARGET),
+                    isEnabled(JsonGenerator.Feature.FLUSH_PASSED_TO_STREAM));
+            _ioContext.close();
         }
-        _writer.close(_ioContext.isResourceManaged() || isEnabled(JsonGenerator.Feature.AUTO_CLOSE_TARGET),
-                isEnabled(JsonGenerator.Feature.FLUSH_PASSED_TO_STREAM));
     }
 
     /*

csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java

@@ -303,6 +303,11 @@ private Feature(boolean defaultState) {
      */
     protected final StreamReadConstraints _streamReadConstraints;
 
+    /**
+     * @since 2.16
+     */
+    protected final IOContext _ioContext;
+
     protected int _formatFeatures;
 
     /**
@@ -411,6 +416,7 @@ public CsvParser(IOContext ctxt, int stdFeatures, int csvFeatures,
             throw new IllegalArgumentException("Can not pass `null` as `java.io.Reader` to read from");
         }
         _objectCodec = codec;
+        _ioContext = ctxt;
         _streamReadConstraints = ctxt.streamReadConstraints();
         _textBuffer = ctxt.constructReadConstrainedTextBuffer();
         DupDetector dups = JsonParser.Feature.STRICT_DUPLICATE_DETECTION.enabledIn(stdFeatures)
@@ -504,7 +510,12 @@ public int releaseBuffered(Writer out) throws IOException {
     public boolean isClosed() { return _reader.isClosed(); }
 
     @Override
-    public void close() throws IOException { _reader.close(); }
+    public void close() throws IOException {
+        if (!isClosed()) {
+            _reader.close();
+            _ioContext.close();
+        }
+    }
 
     /*                                                                                       
     /**********************************************************                              

properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsGenerator.java

@@ -222,7 +222,13 @@ public JsonGenerator overrideFormatFeatures(int values, int mask) { }
     /**********************************************************
      */
 
-//    public void close() throws IOException
+    @Override
+    public void close() throws IOException {
+        if (!isClosed()) {
+            super.close();
+            _ioContext.close();
+        }
+    }
 
 //    public void flush() throws IOException
 

properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java

@@ -46,6 +46,11 @@ public class JavaPropsParser extends ParserMinimalBase
      */
     protected final StreamReadConstraints _streamReadConstraints;
 
+    /**
+     * @since 2.16
+     */
+    protected final IOContext _ioContext;
+
     /**
      * Although most massaging is done later, caller may be interested in the
      * ultimate source.
@@ -101,6 +106,7 @@ public JavaPropsParser(IOContext ctxt, int parserFeatures, Object inputSource,
             ObjectCodec codec, Map<?,?> sourceMap)
     {
         super(parserFeatures);
+        _ioContext = ctxt;
         _streamReadConstraints = ctxt.streamReadConstraints();
         _objectCodec = codec;
         _inputSource = inputSource;
@@ -151,8 +157,11 @@ public int releaseBuffered(Writer w) throws IOException {
 
     @Override
     public void close() throws IOException {
-        _closed = true;
-        _readContext = null;
+        if (!_closed) {
+            _ioContext.close();
+            _closed = true;
+            _readContext = null;
+        }
     }
 
     @Override

toml/src/main/java/com/fasterxml/jackson/dataformat/toml/TomlFactory.java

@@ -270,8 +270,12 @@ public JsonParser _createParser(InputStream in, IOContext ctxt) throws IOExcepti
 
     @Override
     public JsonParser _createParser(Reader r, IOContext ctxt) throws IOException {
-        ObjectNode node = parse(ctxt, r);
-        return new TreeTraversingParser(node); // don't pass our _objectCodec, this part shouldn't be customized
+        try {
+            ObjectNode node = parse(ctxt, r);
+            return new TreeTraversingParser(node); // don't pass our _objectCodec, this part shouldn't be customized
+        } finally {
+            ctxt.close();
+        }
     }
 
     @Override

toml/src/main/java/com/fasterxml/jackson/dataformat/toml/TomlGenerator.java

@@ -120,20 +120,23 @@ public Version version() {
 
     @Override
     public void close() throws IOException {
-        super.close();
-        _flushBuffer();
-        _outputTail = 0; // just to ensure we don't think there's anything buffered
-
-        if (_out != null) {
-            if (_ioContext.isResourceManaged() || isEnabled(StreamWriteFeature.AUTO_CLOSE_TARGET)) {
-                _out.close();
-            } else if (isEnabled(StreamWriteFeature.FLUSH_PASSED_TO_STREAM)) {
-                // If we can't close it, we should at least flush
-                _out.flush();
+        if (!isClosed()) {
+            super.close();
+            _flushBuffer();
+            _outputTail = 0; // just to ensure we don't think there's anything buffered
+
+            if (_out != null) {
+                if (_ioContext.isResourceManaged() || isEnabled(StreamWriteFeature.AUTO_CLOSE_TARGET)) {
+                    _out.close();
+                } else if (isEnabled(StreamWriteFeature.FLUSH_PASSED_TO_STREAM)) {
+                    // If we can't close it, we should at least flush
+                    _out.flush();
+                }
             }
+            _ioContext.close();
+            // Internal buffer(s) generator has can now be released as well
+            _releaseBuffers();
         }
-        // Internal buffer(s) generator has can now be released as well
-        _releaseBuffers();
     }
 
     @Override

yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLGenerator.java

@@ -583,6 +583,7 @@ public void close() throws IOException
                     _writer.flush();
                 }
             }
+            _ioContext.close();
         }
     }