From 1fa16643a7a041959a0e9f90a650433e5320605a Mon Sep 17 00:00:00 2001
From: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Date: Tue, 9 Aug 2022 14:44:53 +0200
Subject: [PATCH] remove not needed weakref

---
 .../spring/webmvc/v5_3/HttpRouteSupport.java         | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/instrumentation/spring/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/HttpRouteSupport.java b/instrumentation/spring/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/HttpRouteSupport.java
index 6b6e3187f121..cafac0b13abb 100644
--- a/instrumentation/spring/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/HttpRouteSupport.java
+++ b/instrumentation/spring/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/HttpRouteSupport.java
@@ -9,7 +9,6 @@
 import static org.springframework.web.util.ServletRequestPathUtils.PATH_ATTRIBUTE;
 
 import io.opentelemetry.context.Context;
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -30,8 +29,8 @@
 
 final class HttpRouteSupport {
 
-  private final AtomicBoolean contextRefreshTriggerred = new AtomicBoolean();
-  @Nullable private WeakReference<DispatcherServlet> dispatcherServlet;
+  private final AtomicBoolean contextRefreshTriggered = new AtomicBoolean();
+  @Nullable private volatile DispatcherServlet dispatcherServlet;
   @Nullable private volatile List<HandlerMapping> handlerMappings;
   private volatile boolean parseRequestPath;
 
@@ -44,7 +43,7 @@ void onFilterInit(FilterConfig filterConfig) {
 
     DispatcherServlet servlet = context.getBeanProvider(DispatcherServlet.class).getIfAvailable();
     if (servlet != null) {
-      dispatcherServlet = new WeakReference<>(servlet);
+      dispatcherServlet = servlet;
 
       ((ConfigurableWebApplicationContext) context)
           .addApplicationListener(new WebContextRefreshListener());
@@ -59,15 +58,14 @@ final class WebContextRefreshListener implements ApplicationListener<ContextRefr
 
     @Override
     public void onApplicationEvent(ContextRefreshedEvent event) {
-      contextRefreshTriggerred.set(true);
+      contextRefreshTriggered.set(true);
     }
   }
 
   boolean hasMappings() {
-    if (contextRefreshTriggerred.compareAndSet(true, false)) {
+    if (contextRefreshTriggered.compareAndSet(true, false)) {
       // reload the handler mappings only if the web app context was recently refreshed
       Optional.ofNullable(dispatcherServlet)
-          .map(WeakReference::get)
           .map(DispatcherServlet::getHandlerMappings)
           .ifPresent(this::setHandlerMappings);
     }