#10781 try to stabilize secondary_super_cache

Signed-off-by: Ludovic Orban <[email protected]>
jetty · Oct 27, 2023 · c22166f · c22166f
1 parent 7be6c4b
commit c22166f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
@@ -19,7 +19,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.util.thread.Invocable;
 import org.eclipse.jetty.util.thread.Invocable.InvocationType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -116,7 +115,8 @@ public boolean isInterested()
     public InvocationType getCallbackInvocationType()
     {
         Callback callback = _interested.get();
-        return Invocable.getInvocationType(callback);
+        // Identical to Invocable.getInvocationType(callback) except that the cast is costly here.
+        return callback == null ? InvocationType.BLOCKING : callback.getInvocationType();
     }
 
     /**

diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -716,9 +716,12 @@ default InvocationType getInvocationType()
      */
     class Wrapper extends Attributes.Wrapper implements Request
     {
+        private final Request request;
+
         public Wrapper(Request wrapped)
         {
             super(wrapped);
+            this.request = wrapped;
         }
 
         @Override
@@ -856,7 +859,8 @@ public Session getSession(boolean create)
         @Override
         public Request getWrapped()
         {
-            return (Request)super.getWrapped();
+            // Identical to (Request)super.getWrapped() except that the cast is costly here.
+            return request;
         }
     }