From ebc6a9be3b13565d432e8d2febeb431a0778cf77 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Wed, 26 Jun 2024 12:04:30 -0400
Subject: [PATCH] Rename dispatchFromThisThread -> executeFromThisThread

---
 java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java     | 4 ++--
 .../java/com/zeroc/IceInternal/CollocatedRequestHandler.java  | 2 +-
 .../src/main/java/com/zeroc/IceInternal/DispatchWorkItem.java | 2 +-
 .../Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java   | 2 +-
 .../main/java/com/zeroc/IceInternal/ThreadPoolCurrent.java    | 4 ++--
 5 files changed, 7 insertions(+), 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
index f35022c825f..6c8cae9de0b 100644
--- 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
index d6d4d96b77e..f32f66a3dd9 100644
--- 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
index beba6e63b7f..7a4f4565ef2 100644
--- 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
index a76b254900e..9bb993d3618 100644
--- 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
index fdff053060c..3cdb8d3f741 100644
--- 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;