Skip to content

Commit 9d246ad

Browse files
lauritPeriecle
andauthored
Cherry pick #10254 for 1.32 patch release (#10274)
Co-authored-by: Roman Kvasnytskyi <[email protected]>
1 parent c30f9d8 commit 9d246ad

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/FutureListenerWrappers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected Boolean computeValue(Class<?> type) {
4343
};
4444

4545
public static boolean shouldWrap(GenericFutureListener<? extends Future<?>> listener) {
46-
return shouldWrap.get(listener.getClass());
46+
return listener != null && shouldWrap.get(listener.getClass());
4747
}
4848

4949
@SuppressWarnings("unchecked")

instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/NettyFutureInstrumentation.java

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ public static void wrapListener(
8282
for (int i = 0; i < listeners.length; ++i) {
8383
if (FutureListenerWrappers.shouldWrap(listeners[i])) {
8484
wrappedListeners[i] = FutureListenerWrappers.wrap(context, listeners[i]);
85+
} else {
86+
wrappedListeners[i] = listeners[i];
8587
}
8688
}
8789
listeners = wrappedListeners;

0 commit comments

Comments
 (0)