This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new b8b54fb073 misc: fix spelling
b8b54fb073 is described below
commit b8b54fb073c98bdf9e616750ac814b3f9c15defb
Author: John Bampton <[email protected]>
AuthorDate: Wed Apr 2 03:09:42 2025 +1000
misc: fix spelling
---
.../catalina/tribes/group/interceptors/LocalStrings.properties | 2 +-
.../catalina/tribes/group/interceptors/LocalStrings_fr.properties | 2 +-
.../catalina/tribes/group/interceptors/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/group/interceptors/TcpFailureDetector.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/MultipartStream.java | 4 ++--
java/org/apache/tomcat/websocket/LocalStrings.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 2 +-
test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 6 +++---
test/org/apache/tomcat/websocket/TestPerMessageDeflate.java | 2 +-
test/webapp/jsp/encoding/README.txt | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
index 32d81cd823..23568e4fcf 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
@@ -83,7 +83,7 @@ tcpFailureDetector.heartbeat.failed=Unable to perform
heartbeat on the TcpFailur
tcpFailureDetector.member.disappeared=Verification complete. Member
disappeared[{0}]
tcpFailureDetector.memberDisappeared.verify=Received memberDisappeared[{0}]
message. Will verify.
tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we
weren''t notified:[{0}]
-tcpFailureDetector.recievedPacket=Received a failure detector packet [{0}]
+tcpFailureDetector.receivedPacket=Received a failure detector packet [{0}]
tcpFailureDetector.still.alive=Verification complete. Member still alive[{0}]
tcpFailureDetector.suspectMember.alive=Suspect member, confirmed alive.[{0}]
tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead.[{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
index ff1f72eb30..4765a53b30 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
@@ -83,7 +83,7 @@ tcpFailureDetector.heartbeat.failed=Incapable de faire une
pulsation ("heatbeat"
tcpFailureDetector.member.disappeared=La vérfication est complète, le membre a
disparu [{0}]
tcpFailureDetector.memberDisappeared.verify=Reçu un message
memberDisappeared[{0}], qui sera vérifié
tcpFailureDetector.performBasicCheck.memberAdded=Le membre a été ajouté bien
qu''aucune notification n''ait été reçue : [{0}]
-tcpFailureDetector.recievedPacket=Réception d''un paquet de détection d''échec
[{0}]
+tcpFailureDetector.receivedPacket=Réception d''un paquet de détection d''échec
[{0}]
tcpFailureDetector.still.alive=Vérification terminée. Le membre [{0}] vit
toujours
tcpFailureDetector.suspectMember.alive=Membre suspect, confirmé vivant.[{0}]
tcpFailureDetector.suspectMember.dead=Un membre suspect a été confirmé mort
[{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
index f9e6eb3a7e..90c4248351 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
@@ -83,7 +83,7 @@ tcpFailureDetector.heartbeat.failed=TcpFailureDetector
のハートビートチ
tcpFailureDetector.member.disappeared=メンバ検証が完了しました。メンバーが消えました [{0}]
tcpFailureDetector.memberDisappeared.verify=memberDisappeared[{0}]メッセージを受信しました。メンバ検証します。
tcpFailureDetector.performBasicCheck.memberAdded=私たちに通知されなかったにもかかわらず、メンバーが追加されました：[{0}]
-tcpFailureDetector.recievedPacket=障害検出パケット [{0}] を受信しました
+tcpFailureDetector.receivedPacket=障害検出パケット [{0}] を受信しました
tcpFailureDetector.still.alive=故障検出チェックが完了しました。メンバー [{0}] は正常です。
tcpFailureDetector.suspectMember.alive=疑わしいクラスタメンバーの生存を確認しました。[{0}]
tcpFailureDetector.suspectMember.dead=疑義メンバが死亡したことが確認されました。[{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index acc6422062..9c1b356a45 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -111,7 +111,7 @@ public class TcpFailureDetector extends
ChannelInterceptorBase implements TcpFai
if (process) {
super.messageReceived(msg);
} else if (log.isDebugEnabled()) {
- log.debug(sm.getString("tcpFailureDetector.recievedPacket", msg));
+ log.debug(sm.getString("tcpFailureDetector.receivedPacket", msg));
}
}// messageReceived
diff --git a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
index 0c76e66955..44e52563e2 100644
--- a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
+++ b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
@@ -186,13 +186,13 @@ public class MultipartStream {
protected static final byte[] HEADER_SEPARATOR = {CR, LF, CR, LF};
/**
- * A byte sequence that that follows a delimiter that will be
+ * A byte sequence that follows a delimiter that will be
* followed by an encapsulation ({@code CRLF}).
*/
protected static final byte[] FIELD_SEPARATOR = {CR, LF};
/**
- * A byte sequence that that follows a delimiter of the last
+ * A byte sequence that follows a delimiter of the last
* encapsulation in the stream ({@code --}).
*/
protected static final byte[] STREAM_TERMINATOR = {DASH, DASH};
diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties
b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 9cf69caf30..b4dcb0928d 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -96,7 +96,7 @@ wsRemoteEndpoint.closed=Message will not be sent because the
WebSocket session h
wsRemoteEndpoint.closedDuringMessage=The remainder of the message will not be
sent because the WebSocket session has been closed
wsRemoteEndpoint.closedOutputStream=This method may not be called as the
OutputStream has been closed
wsRemoteEndpoint.closedWriter=This method may not be called as the Writer has
been closed
-wsRemoteEndpoint.encoderDestoryFailed=Failed to destroy the encoder of type
[{0}]
+wsRemoteEndpoint.encoderDestroyFailed=Failed to destroy the encoder of type
[{0}]
wsRemoteEndpoint.encoderError=Encoding error [{0}]
wsRemoteEndpoint.flushOnCloseFailed=Batched messages still enabled after
session has been closed. Unable to flush remaining batched message.
wsRemoteEndpoint.invalidEncoder=The specified encoder of type [{0}] could not
be instantiated
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
index c9f8b44e1a..abc4f663c9 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
@@ -96,7 +96,7 @@ wsRemoteEndpoint.closed=Le message ne sera pas envoyé parce
que la session WebS
wsRemoteEndpoint.closedDuringMessage=Le reste du message ne sera pas envoyé
parce que la session WebSocket est déjà fermée.
wsRemoteEndpoint.closedOutputStream=La méthode ne peut pas être appelée alors
que l'OutputStream a été fermée
wsRemoteEndpoint.closedWriter=Cette méthode ne doit pas être appelée car le
Writer a été fermé
-wsRemoteEndpoint.encoderDestoryFailed=Echec de la destruction de l''encodeur
de type [{0}]
+wsRemoteEndpoint.encoderDestroyFailed=Echec de la destruction de l''encodeur
de type [{0}]
wsRemoteEndpoint.encoderError=Erreur d''encodage [{0}]
wsRemoteEndpoint.flushOnCloseFailed=Le groupement de messages est toujours
actif après fermeture de la session, impossible d'envoyer les messages restants
wsRemoteEndpoint.invalidEncoder=L''encodeur spécifié de type [{0}] n''a pu
être instancié
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
index 39f3452910..274f05d18d 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
@@ -96,7 +96,7 @@ wsRemoteEndpoint.closed=WebSocket セッションは切断済みのためメッ
wsRemoteEndpoint.closedDuringMessage=WebSocket セッションが切断されているため残りのメッセージは送信できません
wsRemoteEndpoint.closedOutputStream=このメソッドは、OutputStreamが閉じられたときに呼び出されない場合があります。
wsRemoteEndpoint.closedWriter=Writerがクローズされているため、このメソッドを呼び出すことはできません。
-wsRemoteEndpoint.encoderDestoryFailed=タイプ [{0}] のエンコーダーの破棄に失敗しました
+wsRemoteEndpoint.encoderDestroyFailed=タイプ [{0}] のエンコーダーの破棄に失敗しました
wsRemoteEndpoint.encoderError=エンコードエラー [{0}]
wsRemoteEndpoint.flushOnCloseFailed=セッションが閉じられた後にまだ可能であったバッチメッセージ。残りのバッチメッセージをフラッシュできません。
wsRemoteEndpoint.invalidEncoder=指定されたタイプ [{0}] のエンコーダをインスタンス化できませんでした
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index 2da189d089..1faba99c15 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -93,7 +93,7 @@ wsRemoteEndpoint.closed=웹소켓 세션이 이미 닫혔기 때문에, 메시
wsRemoteEndpoint.closedDuringMessage=웹소켓 세션이 이미 닫혔기 때문에, 메시지의 나머지 부분은 전달되지 않을
것입니다.
wsRemoteEndpoint.closedOutputStream=OutputStream이 이미 닫혀 있으므로, 이 메소드는 호출될 수
없습니다.
wsRemoteEndpoint.closedWriter=Writer가 이미 닫혔기 때문에, 이 메소드는 호출될 수 없습니다.
-wsRemoteEndpoint.encoderDestoryFailed=[{0}] 타입의 인코더를 소멸시키지 못했습니다.
+wsRemoteEndpoint.encoderDestroyFailed=[{0}] 타입의 인코더를 소멸시키지 못했습니다.
wsRemoteEndpoint.flushOnCloseFailed=세션이 이미 종료된 이후에도, 메시지들이 배치(batch)에 포함되어
있습니다. 배치에 남아있는 메시지들을 배출할 수 없습니다.
wsRemoteEndpoint.invalidEncoder=지정된 타입 [{0}]의 Encoder의 인스턴스를 생성할 수 없었습니다.
wsRemoteEndpoint.noEncoder=클래스 [{0}]의 객체를 위한 인코더가 지정되지 않았습니다.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index b7a8d7fe95..9fa7083aab 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -95,7 +95,7 @@ wsRemoteEndpoint.closed=由于 WebSocket session 已关闭，消息将不会被
wsRemoteEndpoint.closedDuringMessage=因为 WebSocket session 被关闭，消息的剩余部分将不会被送达
wsRemoteEndpoint.closedOutputStream=由于OutputStream已关闭，不应该调用此方法。
wsRemoteEndpoint.closedWriter=此方法不能调用，因为编写器已关闭。
-wsRemoteEndpoint.encoderDestoryFailed=未能销毁[{0}]类型的编码器
+wsRemoteEndpoint.encoderDestroyFailed=未能销毁[{0}]类型的编码器
wsRemoteEndpoint.flushOnCloseFailed=会话关闭后仍然启用批处理消息。无法刷新剩余的批量消息
wsRemoteEndpoint.invalidEncoder=无法实例化类型为[{0}]的指定编码器
wsRemoteEndpoint.noEncoder=没有为类 [{0}] 的对象指定编码器
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index 2d7dd7c08d..d235602a00 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -740,7 +740,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
try {
instanceManager.destroyInstance(entry);
} catch (IllegalAccessException | InvocationTargetException e)
{
-
log.warn(sm.getString("wsRemoteEndpoint.encoderDestoryFailed",
encoder.getClass()), e);
+
log.warn(sm.getString("wsRemoteEndpoint.encoderDestroyFailed",
encoder.getClass()), e);
}
}
}
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 7840c56c98..c7a64c214f 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -234,7 +234,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
@Test
- public void testNonBlockingReadChunkedSplitBeforeExtensionDelimter()
throws Exception {
+ public void testNonBlockingReadChunkedSplitBeforeExtensionDelimiter()
throws Exception {
String[] requestBody = new String[] {
"14",
";a=b" + SimpleHttpClient.CRLF +
@@ -247,7 +247,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
@Test
- public void testNonBlockingReadChunkedSplitAfterExtensionDelimter() throws
Exception {
+ public void testNonBlockingReadChunkedSplitAfterExtensionDelimiter()
throws Exception {
String[] requestBody = new String[] {
"14;",
"a=b" + SimpleHttpClient.CRLF +
@@ -418,7 +418,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
@Test
- public void testNonBlockingReadChunkedSplitAfterTrailerDelimter() throws
Exception {
+ public void testNonBlockingReadChunkedSplitAfterTrailerDelimiter() throws
Exception {
String[] requestBody = new String[] {
"14" + SimpleHttpClient.CRLF +
"012345678901FINISHED" + SimpleHttpClient.CRLF +
diff --git a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
index 51f3b31e28..5c07755bed 100644
--- a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
+++ b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
@@ -65,7 +65,7 @@ public class TestPerMessageDeflate {
* https://bz.apache.org/bugzilla/show_bug.cgi?id=65317
*/
@Test
- public void testMessagePartThatFillsBufffer() throws IOException {
+ public void testMessagePartThatFillsBuffer() throws IOException {
// Set up the extension using defaults
List<Parameter> parameters = Collections.emptyList();
diff --git a/test/webapp/jsp/encoding/README.txt
b/test/webapp/jsp/encoding/README.txt
index 0c4c10fc85..fad6c6a2bd 100644
--- a/test/webapp/jsp/encoding/README.txt
+++ b/test/webapp/jsp/encoding/README.txt
@@ -16,7 +16,7 @@
================================================================================
A number of the test files in this directory specify conflicting encoding
-in the BOM and and in the XML prolog. The rules for determining the actual
+in the BOM and in the XML prolog. The rules for determining the actual
encoding used in the file are as follows:
1. If there is a BOM, use the encoding defined by the BOM.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
