Issue #5032 - Using BaseHolder template T vs C

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Sep 16, 2020 · c569c87 · c569c87
1 parent aee8b93
commit c569c87
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/BaseHolder.java
@@ -186,9 +186,9 @@ public synchronized boolean isInstance()
         return _instance != null;
     }
 
-    protected <C, W> C wrap(final C component, final Class<W> wrapperFunctionType, final BiFunction<W, C, C> function)
+    protected <W> T wrap(final T component, final Class<W> wrapperFunctionType, final BiFunction<W, T, T> function)
     {
-        C ret = component;
+        T ret = component;
         ServletContextHandler contextHandler = getServletHandler().getServletContextHandler();
         if (contextHandler != null)
         {
@@ -200,14 +200,14 @@ protected <C, W> C wrap(final C component, final Class<W> wrapperFunctionType, f
         return ret;
     }
 
-    protected <C> C unwrap(final C component)
+    protected T unwrap(final T component)
     {
-        C ret = component;
+        T ret = component;
 
         while (ret instanceof Wrapped)
         {
             // noinspection unchecked,rawtypes
-            ret = (C)((Wrapped)ret).getWrapped();
+            ret = (T)((Wrapped)ret).getWrapped();
         }
         return ret;
     }