Rename dispatchFromThisThread -> executeFromThisThread

zeroc-ice · Jun 26, 2024 · ebc6a9b · ebc6a9b
1 parent e2dd516
commit ebc6a9b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java
@@ -829,7 +829,7 @@ public void message(com.zeroc.IceInternal.ThreadPoolCurrent current) {
       final StartCallback finalStartCB = startCB;
       final java.util.List<OutgoingMessage> finalSentCBs = sentCBs;
       final MessageInfo finalInfo = info;
-      _threadPool.dispatchFromThisThread(
+      _threadPool.executeFromThisThread(
           new com.zeroc.IceInternal.DispatchWorkItem(this) {
             @Override
             public void run() {
@@ -991,7 +991,7 @@ public Void call() throws Exception {
     {
       finish(close);
     } else {
-      _threadPool.dispatchFromThisThread(
+      _threadPool.executeFromThisThread(
           new com.zeroc.IceInternal.DispatchWorkItem(this) {
             @Override
             public void run() {

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java
@@ -135,7 +135,7 @@ int invokeAsyncRequest(OutgoingAsyncBase outAsync, int batchRequestNum, boolean
     } else if (_executor) {
       _adapter
           .getThreadPool()
-          .dispatchFromThisThread(
+          .executeFromThisThread(
               new InvokeAllAsync(outAsync, outAsync.getOs(), requestId, batchRequestNum));
     } else // Optimization: directly call dispatchAll if there's no executor.
     {

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchWorkItem.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchWorkItem.java
@@ -20,7 +20,7 @@ public DispatchWorkItem(com.zeroc.Ice.Connection connection) {
   @Override
   public final void execute(ThreadPoolCurrent current) {
     current.ioCompleted(); // Promote a follower
-    current.dispatchFromThisThread(this);
+    current.executeFromThisThread(this);
   }
 
   public com.zeroc.Ice.Connection getConnection() {

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java
@@ -266,7 +266,7 @@ public synchronized boolean finish(EventHandler handler, boolean closeNow) {
     return closeNow;
   }
 
-  public void dispatchFromThisThread(DispatchWorkItem workItem) {
+  public void executeFromThisThread(DispatchWorkItem workItem) {
     if (_executor != null) {
       try {
         _executor.accept(workItem, workItem.getConnection());

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolCurrent.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolCurrent.java
@@ -28,8 +28,8 @@ public void ioCompleted() {
     _threadPool.ioCompleted(this);
   }
 
-  public void dispatchFromThisThread(DispatchWorkItem workItem) {
-    _threadPool.dispatchFromThisThread(workItem);
+  public void executeFromThisThread(DispatchWorkItem workItem) {
+    _threadPool.executeFromThisThread(workItem);
   }
 
   final ThreadPool _threadPool;