[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a990db168d4080f6fe965355048f6540bccaa31b
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index f446a6b..6e692ef 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -78,7 +78,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -114,7 +114,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -270,10 +270,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -297,15 +297,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -772,7 +772,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -865,7 +865,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1069,7 +1069,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1231,7 +1231,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1390,7 +1390,7 @@ public class
[tomcat] 08/08: Fix spellings
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
commit 377bc8522c31135764acbf38b9fc6b308edd6ec3
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 92fdd09..7f39989 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -109,7 +109,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -265,10 +265,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -292,15 +292,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -773,7 +773,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -866,7 +866,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1070,7 +1070,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1232,7 +1232,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1391,7 +1391,7 @@ public class
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a990db168d4080f6fe965355048f6540bccaa31b
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index f446a6b..6e692ef 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -78,7 +78,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -114,7 +114,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -270,10 +270,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -297,15 +297,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -772,7 +772,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -865,7 +865,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1069,7 +1069,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1231,7 +1231,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1390,7 +1390,7 @@ public class
[tomcat] 08/08: Fix spellings
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
commit 377bc8522c31135764acbf38b9fc6b308edd6ec3
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 92fdd09..7f39989 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -109,7 +109,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -265,10 +265,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -292,15 +292,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -773,7 +773,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -866,7 +866,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1070,7 +1070,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1232,7 +1232,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1391,7 +1391,7 @@ public class
[tomcat] 08/08: Fix spellings
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
commit 377bc8522c31135764acbf38b9fc6b308edd6ec3
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 92fdd09..7f39989 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -109,7 +109,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -265,10 +265,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -292,15 +292,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -773,7 +773,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -866,7 +866,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1070,7 +1070,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1232,7 +1232,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1391,7 +1391,7 @@ public class
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a990db168d4080f6fe965355048f6540bccaa31b
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index f446a6b..6e692ef 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -78,7 +78,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -114,7 +114,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -270,10 +270,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -297,15 +297,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -772,7 +772,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -865,7 +865,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1069,7 +1069,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1231,7 +1231,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1390,7 +1390,7 @@ public class
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a990db168d4080f6fe965355048f6540bccaa31b
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index f446a6b..6e692ef 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -78,7 +78,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -114,7 +114,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -270,10 +270,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -297,15 +297,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -772,7 +772,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -865,7 +865,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1069,7 +1069,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1231,7 +1231,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1390,7 +1390,7 @@ public class
[tomcat] 08/08: Fix spellings
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
commit 377bc8522c31135764acbf38b9fc6b308edd6ec3
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 92fdd09..7f39989 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -109,7 +109,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -265,10 +265,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -292,15 +292,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -773,7 +773,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -866,7 +866,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1070,7 +1070,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1232,7 +1232,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1391,7 +1391,7 @@ public class
[tomcat] 08/08: Fix spellings
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
commit 377bc8522c31135764acbf38b9fc6b308edd6ec3
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 92fdd09..7f39989 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -109,7 +109,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -265,10 +265,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -292,15 +292,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -773,7 +773,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -866,7 +866,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1070,7 +1070,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1232,7 +1232,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1391,7 +1391,7 @@ public class
