Shift the buf free nil check back to json encoder to better appease c…

…ode coverage numbers
uber-go · Jun 26, 2018 · 7ba34d3 · 7ba34d3
1 parent b4a606a
commit 7ba34d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/buffer/buffer.go b/buffer/buffer.go
@@ -111,7 +111,5 @@ func (b *Buffer) TrimNewline() {
 //
 // Callers must not retain references to the Buffer after calling Free.
 func (b *Buffer) Free() {
-	if b != nil {
-		b.pool.put(b)
-	}
+	b.pool.put(b)
 }
diff --git a/zapcore/json_encoder.go b/zapcore/json_encoder.go
@@ -44,7 +44,9 @@ func getJSONEncoder() *jsonEncoder {
 }
 
 func putJSONEncoder(enc *jsonEncoder) {
-	enc.reflectBuf.Free()
+	if enc.reflectBuf != nil {
+		enc.reflectBuf.Free()
+	}
 	enc.EncoderConfig = nil
 	enc.buf = nil
 	enc.spaced = false