Skip to content

Commit dddabf5

Browse files
authored
Fix NPE in InpuStream#available advice (#257)
Signed-off-by: Pavol Loffay <[email protected]>
1 parent 0fd347a commit dddabf5

File tree

1 file changed

+8
-6
lines changed
  • instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream

1 file changed

+8
-6
lines changed

instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream/InputStreamUtils.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,13 @@ public static void available(InputStream inputStream, int available) {
147147
}
148148
SpanAndBuffer spanAndBuffer =
149149
GlobalObjectRegistry.inputStreamToSpanAndBufferMap.get(inputStream);
150-
InputStreamUtils.addBody(
151-
spanAndBuffer.span,
152-
spanAndBuffer.attributeKey,
153-
spanAndBuffer.byteArrayBuffer,
154-
spanAndBuffer.charset);
155-
GlobalObjectRegistry.inputStreamToSpanAndBufferMap.remove(inputStream);
150+
if (spanAndBuffer != null) {
151+
InputStreamUtils.addBody(
152+
spanAndBuffer.span,
153+
spanAndBuffer.attributeKey,
154+
spanAndBuffer.byteArrayBuffer,
155+
spanAndBuffer.charset);
156+
GlobalObjectRegistry.inputStreamToSpanAndBufferMap.remove(inputStream);
157+
}
156158
}
157159
}

0 commit comments

Comments
 (0)