[tomcat] branch master updated: Fix spelling

2020-09-21 Thread 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 8e72db4  Fix spelling
8e72db4 is described below

commit 8e72db43acf7e77c4867824402884da95fb9305f
Author: Mark Thomas 
AuthorDate: Mon Sep 21 20:28:12 2020 +0100

Fix spelling
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6dd713f..d7e275b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -98,7 +98,7 @@
   
   
 When logging HTTP/2 debug messages, use consistent formatting for 
stream
-idnetifiers. (markt)
+identifiers. (markt)
   
 
   


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



[tomcat] branch master updated: Fix spelling

2020-09-16 Thread 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 810f42c  Fix spelling
810f42c is described below

commit 810f42c4cce17bae4987c75017b8909033813071
Author: Mark Thomas 
AuthorDate: Wed Sep 16 19:25:33 2020 +0100

Fix spelling

No need for backwards compatibility changes. The new name is now
consistent with the documentation. Any users relying on the old spelling
can configure the attribute name explicitly.
---
 java/org/apache/catalina/ha/session/JvmRouteBinderValve.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java 
b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 66fd439..55201f6 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -99,7 +99,7 @@ public class JvmRouteBinderValve extends ValveBase implements 
ClusterValve {
  */
 protected long numberOfSessions = 0;
 
-protected String sessionIdAttribute = 
"org.apache.catalina.ha.session.JvmRouteOrignalSessionID";
+protected String sessionIdAttribute = 
"org.apache.catalina.ha.session.JvmRouteOriginalSessionID";
 
 
 /*--Logic---*/


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



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

2020-09-16 Thread 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 
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 true 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 true 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