Merge branch '2.7'

Author: cowtowncoder

release-notes/CREDITS

@@ -56,7 +56,6 @@ Oliver Röss (cloudyday@github)
 * Reported #98: Escape char is not being escaped during serialization
  (2.6.4)
 
-<<<<<<< HEAD
 Justo Ruiz Ferrer (jrferrer@github)
 
 * Contributed #89: Allow choice of using header-line declaration to reorder columns
@@ -84,3 +83,8 @@ Brian Moriarty (morbrian@github)
 
 * Contributed #106: Null fields are always ignored when serializing list of objects
  (2.7.0)
+
+Peter Ansell (ansell@github)
+
+* Contributed fix for #128: Write out headers even if no data rows written
+ (2.7.7)

release-notes/VERSION

@@ -19,6 +19,11 @@ No changes since 2.8.0.
 
 - Removed unused `CsvEncoding` class.
 
+2.7.7 (not yet released)
+
+#128: Write out headers even if no data rows written
+ (contributed by Peter A)
+
 2.7.6 (23-Jul-2016)
 2.7.5 (11-Jun-2016)
 

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

@@ -433,7 +433,6 @@ public void close() throws IOException
         if (_handleFirstLine) {
             _handleFirstLine();
         }
-
         _writer.close(_ioContext.isResourceManaged() || isEnabled(JsonGenerator.Feature.AUTO_CLOSE_TARGET));
     }