[tomcat] branch master updated: Fix spelling without breaking API

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new c47fe61  Fix spelling without breaking API
c47fe61 is described below

commit c47fe61fd9242cff762fc5174a2cc7a6ac8d5a7e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 16 19:13:48 2020 +0100

    Fix spelling without breaking API
---
 .../apache/catalina/ha/session/DeltaManager.java   | 37 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 6155820..d048561 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -266,8 +266,18 @@ public class DeltaManager extends ClusterManagerBase{
 
     /**
      * @return Returns the counterNoStateTransferred.
+     * @deprecated Use {@link #getCounterNoStateTransferred()}. Will be removed
+     *             in Tomcat 10 onwards.
      */
+    @Deprecated
     public int getCounterNoStateTransfered() {
+        return getCounterNoStateTransferred();
+    }
+
+    /**
+     * @return Returns the counterNoStateTransferred.
+     */
+    public int getCounterNoStateTransferred() {
         return counterNoStateTransferred;
     }
 
@@ -290,16 +300,37 @@ public class DeltaManager extends ClusterManagerBase{
 
     /**
      * @return <code>true</code> if the state transfer is complete.
+     * @deprecated Use {@link #getStateTransferred()}. Will be removed in 
Tomcat
+     *             10 onwards.
      */
+    @Deprecated
     public boolean getStateTransfered() {
-        return stateTransferred;
+        return getStateTransferred();
     }
 
     /**
      * Set that state transferred is complete
      * @param stateTransferred Flag value
+     * @deprecated Use {@link #setStateTransferred(boolean)}. Will be removed 
in
+     *             Tomcat 10 onwards.
      */
+    @Deprecated
     public void setStateTransfered(boolean stateTransferred) {
+        setStateTransferred(stateTransferred);
+    }
+
+    /**
+     * @return <code>true</code> if the state transfer is complete.
+     */
+    public boolean getStateTransferred() {
+        return stateTransferred;
+    }
+
+    /**
+     * Set that state transferred is complete
+     * @param stateTransferred Flag value
+     */
+    public void setStateTransferred(boolean stateTransferred) {
         this.stateTransferred = stateTransferred;
     }
 
@@ -771,7 +802,7 @@ public class DeltaManager extends ClusterManagerBase{
                 }
                 reqNow = System.currentTimeMillis();
                 isTimeout = ((reqNow - reqStart) > (1000L * 
getStateTransferTimeout()));
-            } while ((!getStateTransfered()) && (!isTimeout) && 
(!isNoContextManagerReceived()));
+            } while ((!getStateTransferred()) && (!isTimeout) && 
(!isNoContextManagerReceived()));
         } else {
             if(getStateTransferTimeout() == -1) {
                 // wait that state is transferred
@@ -780,7 +811,7 @@ public class DeltaManager extends ClusterManagerBase{
                         Thread.sleep(100);
                     } catch (Exception sleep) {
                     }
-                } while ((!getStateTransfered())&& 
(!isNoContextManagerReceived()));
+                } while ((!getStateTransferred())&& 
(!isNoContextManagerReceived()));
                 reqNow = System.currentTimeMillis();
             }
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org