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
commit 230b351914c789fdae0e3e8fb70f808615bfbd00
Author: Mark Thomas <ma...@apache.org>
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 ef607e3..6155820 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 <code>true</code> 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() {
@@ -692,7 +692,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) {
@@ -785,7 +785,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()) {
@@ -989,7 +989,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
- counterNoStateTransfered = 0 ;
+ counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1151,7 +1151,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort())));
}
stateTransferCreateSendTime = msg.getTimestamp() ;
- stateTransfered = true ;
+ stateTransferred = true ;
}
/**
@@ -1310,7 +1310,7 @@ public class DeltaManager extends ClusterManagerBase{
"SESSION-STATE-TRANSFERRED" + getName());
newmsg.setTimestamp(findSessionTimestamp);
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("deltaManager.createMessage.allSessionTransfered",getName()));
+
log.debug(sm.getString("deltaManager.createMessage.allSessionTransferred",getName()));
}
counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE++;
cluster.send(newmsg, sender);
diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 6817c7a..66fd439 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -350,7 +350,7 @@ public class JvmRouteBinderValve extends ValveBase
implements ClusterValve {
// change
if (sessionIdAttribute != null && !sessionIdAttribute.isEmpty()) {
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("jvmRoute.set.orignalsessionid",sessionIdAttribute,sessionId));
+
log.debug(sm.getString("jvmRoute.set.originalsessionid",sessionIdAttribute,sessionId));
}
request.setAttribute(sessionIdAttribute, sessionId);
}
diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 406a2cc..7b614d6 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -23,7 +23,7 @@ clusterSessionListener.noManager=Context manager doesn''t
exist:[{0}]
deltaManager.createMessage.access=Manager [{0}]: create session access message
for session [{1}]
deltaManager.createMessage.accessChangePrimary=Manager [{0}]: create change
primary node message for session [{1}]
deltaManager.createMessage.allSessionData=Manager [{0}] sent all session data.
-deltaManager.createMessage.allSessionTransfered=Manager [{0}] sent all session
data transferred
+deltaManager.createMessage.allSessionTransferred=Manager [{0}] sent all
session data transferred
deltaManager.createMessage.delta=Manager [{0}]: create delta request message
for session [{1}]
deltaManager.createMessage.expire=Manager [{0}]: create session expire message
for session [{1}]
deltaManager.createMessage.unableCreateDeltaRequest=Unable to serialize delta
request for sessionid [{0}]
@@ -50,7 +50,7 @@ deltaManager.receiveMessage.error=Manager [{0}]: Unable to
receive message throu
deltaManager.receiveMessage.eventType=Manager [{0}]: Received SessionMessage
of type=[{1}] from [{2}]
deltaManager.receiveMessage.expired=Manager [{0}]: received session expired
message for session [{1}]
deltaManager.receiveMessage.noContextManager=Manager [{0}] received from node
[{1}:{2}] no context manager.
-deltaManager.receiveMessage.transfercomplete=Manager [{0}] received from node
[{1}:{2}] session state transfered.
+deltaManager.receiveMessage.transfercomplete=Manager [{0}] received from node
[{1}:{2}] session state transferred.
deltaManager.receiveMessage.unloadingAfter=Manager [{0}]: unloading sessions
complete
deltaManager.receiveMessage.unloadingBegin=Manager [{0}]: start unloading
sessions
deltaManager.registerCluster=Register manager [{0}] to cluster element [{1}]
with name [{2}]
@@ -80,7 +80,7 @@ jvmRoute.foundManager=Found Cluster Manager [{0}] at [{1}]
jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is
not being used. Fail over will still work, providing a PersistentManager is
used.
jvmRoute.notFoundManager=Not found Cluster Manager at [{0}]
-jvmRoute.set.orignalsessionid=Set Orginal Session id at request attribute
[{0}] value: [{1}]
+jvmRoute.set.originalsessionid=Set Orginal Session id at request attribute
[{0}] value: [{1}]
jvmRoute.turnoverInfo=Turnover Check time [{0}] msec
jvmRoute.valve.started=JvmRouteBinderValve started
jvmRoute.valve.stopped=JvmRouteBinderValve stopped
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_es.properties
b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
index 9a5bee5..294fc14 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
@@ -18,7 +18,7 @@ backupManager.startUnable=Imposible de iniciar BackupManager:
[{0}]\n
deltaManager.createMessage.access=Gestor [{0}]: creado mensaje de sesión [{1}]
acceso.
deltaManager.createMessage.accessChangePrimary=Gestor [{0}]: creado mensaje de
sesión [{1}] acceso para cambiar el primario.
deltaManager.createMessage.allSessionData=Gestor [{0}] envía todos los datos
de sesión.
-deltaManager.createMessage.allSessionTransfered=Gestor [{0}] envía todos los
datos de sesión transferidos
+deltaManager.createMessage.allSessionTransferred=Gestor [{0}] envía todos los
datos de sesión transferidos
deltaManager.createMessage.delta=Gestor [{0}]: crea mensaje de sesión [{1}] de
requerimiento delta.
deltaManager.createMessage.expire=Gestor [{0}]: crea mensaje de sesión [{1}]
de expiración.
deltaManager.createMessage.unableCreateDeltaRequest=No puedo serializar
requerimiento delta para la id de sesión [{0}]
@@ -71,7 +71,7 @@ jvmRoute.foundManager=Hallado Clúster DeltaManager [{0}] en
[{1}]
jvmRoute.missingJvmRouteAttribute=¡No se ha configurado atributo de motor
jvmRoute!
jvmRoute.noCluster=La válvula JvmRouterBinderValve se encuentra configurada,
pero no se usa el clúster. Aún funcionará la tolerancia a fallos, siempre que
se esté usando PersistentManager.
jvmRoute.notFoundManager=No hallado Clúster DeltaManager [{0}] en [{1}]
-jvmRoute.set.orignalsessionid=Puesta id Orginal de Sesión en atributo de
requerimiento [{0}] valor: [{1}]
+jvmRoute.set.originalsessionid=Puesta id Orginal de Sesión en atributo de
requerimiento [{0}] valor: [{1}]
jvmRoute.turnoverInfo=Ajustado tiempo de Chequeo a [{0}] mseg
jvmRoute.valve.started=JvmRouteBinderValve arrancada
jvmRoute.valve.stopped=JvmRouteBinderValve parada
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
index 90cde60..bb5e9fe 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
@@ -23,7 +23,7 @@ clusterSessionListener.noManager=Le gestionnaire de session
du contexte n''exist
deltaManager.createMessage.access=Gestionnaire de session [{0}] : création du
message de session [{1}] d''accès
deltaManager.createMessage.accessChangePrimary=Gestionnaire de session [{0}] :
création du message de session [{1}] accès pour changer le primaire
deltaManager.createMessage.allSessionData=Gestionnaire de session [{0}] envoyé
toutes les données de session
-deltaManager.createMessage.allSessionTransfered=Gestionnaire de session [{0}]
envoi du message signalant le transfert de toutes les données de session
+deltaManager.createMessage.allSessionTransferred=Gestionnaire de session [{0}]
envoi du message signalant le transfert de toutes les données de session
deltaManager.createMessage.delta=Gestionnaire de session [{0}] : création du
message [{0}] de requête delta
deltaManager.createMessage.expire=Gestionnaire de session [{0}] : création du
message [{1}] d''expiration de session
deltaManager.createMessage.unableCreateDeltaRequest=Impossible de sérialiser
la requête delta pour l''id de session [{0}]
@@ -80,7 +80,7 @@ jvmRoute.foundManager=Trouvé le gestionnaire de session du
cluster [{0}] à [{1
jvmRoute.missingJvmRouteAttribute=Pas d'attribut jvmRoute configuré sur le
moteur
jvmRoute.noCluster=La JvmRouterBinderValve est configurée mais le cluster
n'est pas activé, la bascule vers un autre serveur fonctionnera tout de même à
condition qu'un PersistentManager soit utilisé
jvmRoute.notFoundManager=Gestionnaire de cluster ("Cluster Manager") non
trouvé à [{0}]
-jvmRoute.set.orignalsessionid=Fixe l''id de session d''origine dans
l''attribut de requête [{0}] valeur : [{1}]
+jvmRoute.set.originalsessionid=Fixe l''id de session d''origine dans
l''attribut de requête [{0}] valeur : [{1}]
jvmRoute.turnoverInfo=Temps de vérification de turnover [{0}] ms
jvmRoute.valve.started=La JvmRouteBinderValve a démarrée
jvmRoute.valve.stopped=JvmRouteBinderValve s'est arrêté
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
index 1ab352e..9c3f3eb 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
@@ -23,7 +23,7 @@ clusterSessionListener.noManager=Context Managerが存在しません。
deltaManager.createMessage.access=Manager [{0}]: セッション [{1}] へのアクセスメッセージを作成します。
deltaManager.createMessage.accessChangePrimary=Manager[{0}]: セッション [{1}]
でプライマリノード変更メッセージを作成しました。
deltaManager.createMessage.allSessionData=Manager [{0}] はすべてのセッションデータを送信しました。
-deltaManager.createMessage.allSessionTransfered=Manager
[{0}]はすべてのセッションデータ転送を送信しました。
+deltaManager.createMessage.allSessionTransferred=Manager
[{0}]はすべてのセッションデータ転送を送信しました。
deltaManager.createMessage.delta=Manager [{0}]：セッション[{1}]のデルタリクエストメッセージを作成します
deltaManager.createMessage.expire=Manager
[{0}]：セッション[{1}]のセッションの期限切れメッセージを作成します。
deltaManager.createMessage.unableCreateDeltaRequest=セッションID
[{0}]のDeltaRequestシリアライズできません。
@@ -80,7 +80,7 @@ jvmRoute.foundManager=コンテキスト [{1}] のCluster Manager [{0}] を発
jvmRoute.missingJvmRouteAttribute=jvmRoute 属性にエンジンが指定されていません。
jvmRoute.noCluster=JvmRouterBinderValveは設定されていますが、クラスタリングは使用されていません。
PersistentManagerが使用されている場合、フェールオーバーは引き続き機能します。
jvmRoute.notFoundManager=[{0}]でCluster Managerが見つかりません。
-jvmRoute.set.orignalsessionid=オリジナルSession idをリクエスト属性[{0}]の値：[{1}]で設定します。
+jvmRoute.set.originalsessionid=オリジナルSession idをリクエスト属性[{0}]の値：[{1}]で設定します。
jvmRoute.turnoverInfo=折り返しの所要時間は [{0}] ミリ秒でした。
jvmRoute.valve.started=JvmRouteBinderValve が起動しました。
jvmRoute.valve.stopped=JvmRouteBinderValve が停止しました。
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
b/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
index 664746b9..571e6fb 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
@@ -23,7 +23,7 @@ clusterSessionListener.noManager=컨텍스트 매니저가 존재하지 않습
deltaManager.createMessage.access=매니저 [{0}]: 세션(ID: [{1}])을 위한 세션 접근 메시지를
생성합니다.
deltaManager.createMessage.accessChangePrimary=매니저 [{0}]: 세션(ID: [{1}])을 위해
Primary 노드 변경 메시지를 생성합니다.
deltaManager.createMessage.allSessionData=매니저 [{0}]이(가) 모든 세션 데이터를 전송했습니다.
-deltaManager.createMessage.allSessionTransfered=매니저 [{0}]이(가), 모든 세션 데이터 전송 완료
메시지를 보냈습니다.
+deltaManager.createMessage.allSessionTransferred=매니저 [{0}]이(가), 모든 세션 데이터 전송
완료 메시지를 보냈습니다.
deltaManager.createMessage.delta=매니저 [{0}]: 세션(ID: [{1}])을 위한 델타 요청 메시지를 생성합니다.
deltaManager.createMessage.expire=매니저 [{0}]: 세션(ID: [{1}])을 위한 세션 만료 메시지를
생성합니다.
deltaManager.createMessage.unableCreateDeltaRequest=세션 ID [{0}]을(를) 위한 델타 요청을
직렬화할 수 없습니다.
@@ -80,7 +80,7 @@ jvmRoute.foundManager=[{1}]에서 클러스터 매니저 [{0}]을(를) 찾았습
jvmRoute.missingJvmRouteAttribute=엔진의 jvmRoute 속성이 설정되지 않았습니다!
jvmRoute.noCluster=JvmRouterBinderValve가 설정되었지만, 클러스터링이 사용되고 있지 않습니다.
PersistentManager가 사용되는 경우, Fail over는 여전히 정상 동작할 것입니다.
jvmRoute.notFoundManager=[{0}]에서 클러스터 매니저를 찾을 수 없습니다.
-jvmRoute.set.orignalsessionid=요청의 속성 [{0}]에 원래의 세션 ID를 설정합니다: [{1}]
+jvmRoute.set.originalsessionid=요청의 속성 [{0}]에 원래의 세션 ID를 설정합니다: [{1}]
jvmRoute.turnoverInfo=Failover를 위한 jvmRoute 교체 수행 시간: [{0}] 밀리초
jvmRoute.valve.started=JvmRouteBinderValve가 시작됐습니다.
jvmRoute.valve.stopped=JvmRouteBinderValve가 중지되었습니다.
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
index 865325f..4630522 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -23,7 +23,7 @@ clusterSessionListener.noManager=上下文管理器不存在：[{0}]
deltaManager.createMessage.access=管理器[{0}]：创建会话为会话[{1}]存取消息
deltaManager.createMessage.accessChangePrimary=管理器{0}：为会话{1}创建更改主节点消息。
deltaManager.createMessage.allSessionData=管理器[{0}]发送了所有会话数据。
-deltaManager.createMessage.allSessionTransfered=管理器[{0}]发送了所有传输的会话数据
+deltaManager.createMessage.allSessionTransferred=管理器[{0}]发送了所有传输的会话数据
deltaManager.createMessage.delta=管理器[{0}] )：为会话[{1}]创建增量请求消息
deltaManager.createMessage.expire=管理器[{0}] (：为会话[{1}]创建会话过期消息
deltaManager.createMessage.unableCreateDeltaRequest=无法序列化sessionid[{0}]的增量请求
@@ -80,7 +80,7 @@ jvmRoute.foundManager=在[{1}]找到群集管理器[{0}]
jvmRoute.missingJvmRouteAttribute=没有配置引擎jvmRoute属性！
jvmRoute.noCluster=已配置JvmRouterBinderValve，但未使用群集。如果使用了PersistentManager，故障转移仍然有效。
jvmRoute.notFoundManager=没有在 [{0}] 找到Cluster Manager
-jvmRoute.set.orignalsessionid=在请求属性[{0}]值：[{1}]处设置原始会话ID
+jvmRoute.set.originalsessionid=在请求属性[{0}]值：[{1}]处设置原始会话ID
jvmRoute.turnoverInfo=周转检查时间[{0}]msec
jvmRoute.valve.started=JvmRouteBinderValve 启动
jvmRoute.valve.stopped=JvmRouteBinderValve停止
diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
index fae03b9..a7427c9 100644
--- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
@@ -81,7 +81,7 @@
writeable="false"/>
<attribute
name="counterNoStateTransfered"
- description="Count the failed session transfers noStateTransfered"
+ description="Count the failed session transfers noStateTransferred"
type="int"
writeable="false"/>
<attribute
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
