This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3f26bed Fix spelling without breaking API
3f26bed is described below
commit 3f26bed456b324e9fdcbea7b404f98ec638a2a30
Author: Mark Thomas <[email protected]>
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 7f39989..f0b797e 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;
}
@@ -852,7 +883,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
@@ -861,7 +892,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: [email protected]
For additional commands, e-mail: [email protected]
