From 5ac442d4375cb07ed2006fdd6f0eec1c98ed9145 Mon Sep 17 00:00:00 2001
From: Pavol Loffay <p.loffay@gmail.com>
Date: Mon, 8 Feb 2021 17:41:10 +0100
Subject: [PATCH] Fix NPE in InpuStream#available advice

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
---
 .../java/inputstream/InputStreamUtils.java         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream/InputStreamUtils.java b/instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream/InputStreamUtils.java
index db37914fc..35a33d124 100644
--- a/instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream/InputStreamUtils.java
+++ b/instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream/InputStreamUtils.java
@@ -147,11 +147,13 @@ public static void available(InputStream inputStream, int available) {
     }
     SpanAndBuffer spanAndBuffer =
         GlobalObjectRegistry.inputStreamToSpanAndBufferMap.get(inputStream);
-    InputStreamUtils.addBody(
-        spanAndBuffer.span,
-        spanAndBuffer.attributeKey,
-        spanAndBuffer.byteArrayBuffer,
-        spanAndBuffer.charset);
-    GlobalObjectRegistry.inputStreamToSpanAndBufferMap.remove(inputStream);
+    if (spanAndBuffer != null) {
+      InputStreamUtils.addBody(
+          spanAndBuffer.span,
+          spanAndBuffer.attributeKey,
+          spanAndBuffer.byteArrayBuffer,
+          spanAndBuffer.charset);
+      GlobalObjectRegistry.inputStreamToSpanAndBufferMap.remove(inputStream);
+    }
   }
 }