Merge branch '2.10'

stefanleh · Jan 15, 2019 · 00c3d1d · 00c3d1d
2 parents 2ad2a88 + 54ef645
commit 00c3d1d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvGenerator.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvGenerator.java
@@ -425,7 +425,8 @@ public void close() throws IOException
         if (_handleFirstLine) {
             _handleFirstLine();
         }
-        _writer.close(_ioContext.isResourceManaged() || isEnabled(StreamWriteFeature.AUTO_CLOSE_TARGET));
+        _writer.close(_ioContext.isResourceManaged() || isEnabled(StreamWriteFeature.AUTO_CLOSE_TARGET),
+                isEnabled(StreamWriteFeature.FLUSH_PASSED_TO_STREAM));
     }
 
     /*

diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvEncoder.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvEncoder.java
@@ -872,12 +872,12 @@ public void flush(boolean flushStream) throws IOException
         }
     }
 
-    public void close(boolean autoClose) throws IOException
+    public void close(boolean autoClose, boolean flushStream) throws IOException
     {
         _flushBuffer();
         if (autoClose) {
             _out.close();
-        } else {
+        } else if (flushStream) {
             // If we can't close it, we should at least flush
             _out.flush();
         }

diff --git a/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLGenerator.java b/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLGenerator.java
@@ -416,7 +416,9 @@ private final void _writeFieldName(String name)
     @Override
     public final void flush() throws IOException
     {
-        _writer.flush();
+        if (isEnabled(StreamWriteFeature.FLUSH_PASSED_TO_STREAM)) {
+            _writer.flush();
+        }
     }
 
     @Override
@@ -436,7 +438,7 @@ public void close() throws IOException
             if (_writer != null) {
                 if (_ioContext.isResourceManaged() || isEnabled(StreamWriteFeature.AUTO_CLOSE_TARGET)) {
                     _writer.close();
-                } else  if (isEnabled(StreamWriteFeature.FLUSH_PASSED_TO_STREAM)) {
+                } else if (isEnabled(StreamWriteFeature.FLUSH_PASSED_TO_STREAM)) {
                     // If we can't close it, we should at least flush
                     _writer.flush();
                 }