remove not needed weakref

open-telemetry · Aug 9, 2022 · 1fa1664 · 1fa1664
1 parent dc8ca71
commit 1fa1664
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/...y/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/HttpRouteSupport.java b/...y/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);
  }