Merge pull request #444 from PascalSchumacher/close_JsonGenerator

Close JsonGenerators after usage.
logfellow · Nov 1, 2020 · ab1ddcb · ab1ddcb
2 parents c6b3af9 + c886112
commit ab1ddcb
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/java/net/logstash/logback/composite/CompositeJsonFormatter.java b/src/main/java/net/logstash/logback/composite/CompositeJsonFormatter.java
@@ -166,8 +166,9 @@ public byte[] writeEventAsBytes(Event event) throws IOException {
     }
 
     public void writeEventToOutputStream(Event event, OutputStream outputStream) throws IOException {
-        JsonGenerator generator = createGenerator(outputStream);
-        writeEventToGenerator(generator, event);
+        try (JsonGenerator generator = createGenerator(outputStream)) {
+            writeEventToGenerator(generator, event);
+        }
         /*
          * Do not flush the outputStream.
          * 
@@ -179,10 +180,11 @@ public void writeEventToOutputStream(Event event, OutputStream outputStream) thr
     public String writeEventAsString(Event event) throws IOException {
         SegmentedStringWriter writer = new SegmentedStringWriter(getBufferRecycler());
 
-        JsonGenerator generator = createGenerator(writer);
-        writeEventToGenerator(generator, event);
-        writer.flush();
-        return writer.getAndClear();
+        try (JsonGenerator generator = createGenerator(writer)) {
+            writeEventToGenerator(generator, event);
+            writer.flush();
+            return writer.getAndClear();
+        }
     }
 
     protected void writeEventToGenerator(JsonGenerator generator, Event event) throws IOException {