[Bug 65144] New: deltaSession.notifying: Format string/argument mismatch

2021-02-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65144

Bug ID: 65144
   Summary: deltaSession.notifying: Format string/argument
mismatch
   Product: Tomcat 9
   Version: 9.0.43
  Hardware: PC
OS: Linux
Status: NEW
  Severity: trivial
  Priority: P2
 Component: Cluster
  Assignee: dev@tomcat.apache.org
  Reporter: p...@wickenrode.com
  Target Milestone: -

Format String "deltaSession.notifying" expects two arguments:

deltaSession.notifying=Notifying cluster of session expiration: primary=[{0}],
sessionId [{1}]

However the code in DeltaSession.java invokes it with three arguments:

log.debug(sm.getString("deltaSession.notifying",
((ClusterManager)manager).getName(),
Boolean.valueOf(isPrimarySession()),
expiredId
));

This results in ambiguous log output:

15-Feb-2021 22:32:27.205 FEIN [http-nio-2015-exec-6]
org.apache.catalina.ha.session.DeltaSession.expire Notifying cluster of session
expiration: primary=[/clusterjsp], sessionId [false]

Notice the sessionId is displayed as "false", which is actually the
isPrimarySession() state

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 65144] deltaSession.notifying: Format string/argument mismatch

2021-02-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65144

Max Lohrmann  changed:

   What|Removed |Added

 CC||p...@wickenrode.com

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: BZ65144: Fix debug string

2021-02-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm 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 01ceebb  BZ65144: Fix debug string
01ceebb is described below

commit 01ceebb8e2aeaad7eea97982900928a3dbaf3056
Author: remm 
AuthorDate: Tue Feb 16 14:22:29 2021 +0100

BZ65144: Fix debug string
---
 java/org/apache/catalina/ha/session/LocalStrings.properties   | 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_es.properties| 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_fr.properties| 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_ja.properties| 1 -
 java/org/apache/catalina/ha/session/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties | 1 -
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 7b614d6..5ba274a 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -69,7 +69,7 @@ deltaRequest.ssid.mismatch=Session id mismatch, not executing 
the delta request
 deltaRequest.ssid.null=Session Id is null for setSessionId
 deltaRequest.wrongPrincipalClass=ClusterManager only support GenericPrincipal. 
Your realm used principal class [{0}].
 
-deltaSession.notifying=Notifying cluster of session expiration: primary=[{0}], 
sessionId [{1}]
+deltaSession.notifying=Notifying cluster of session expiration: manager [{0}], 
primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() loading session [{0}]
 deltaSession.writeSession=writeObject() storing session [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
index 294fc14..0241e69 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
@@ -60,7 +60,7 @@ deltaRequest.removeUnable=Imposible eliminar elemento:
 deltaRequest.showPrincipal=El Principal [{0}] está puesto a sesión [{1}]
 deltaRequest.wrongPrincipalClass=DeltaManager sólo soporta GenericPrincipal. 
Tu reino utilizó clase principal [{0}].
 
-deltaSession.notifying=Notificando clúster de expiración primaria=[{0}] 
sessionId [{1}]
+deltaSession.notifying=Notificando clúster de expiración manager [{0}], 
primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() cargando sesión [{0}]
 deltaSession.writeSession=writeObject() guardando sesión [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
index bb5e9fe..8ef53cf 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
@@ -69,7 +69,7 @@ deltaRequest.ssid.mismatch=L'id de session ne correspond pas, 
la requête delta
 deltaRequest.ssid.null=L'id de session est null pour setSessionId
 deltaRequest.wrongPrincipalClass=Un ClusterManager n''accepte que des 
GenericPrincipal. Votre realm a utilisé la classe de "principal" [{0}]
 
-deltaSession.notifying=Notification du cluster de l''expiration de la session 
: primaire=[{0}] sessionId [{1}]
+deltaSession.notifying=Notification du cluster de l''expiration de la session 
: manager [{0}], primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() charge la session [{0}]
 deltaSession.writeSession=writeObject() stocke la session [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
index 9c3f3eb..c520ce2 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
@@ -69,7 +69,6 @@ deltaRequest.ssid.mismatch=セッションIDが一致しません。デルタリ
 deltaRequest.ssid.null=setSessionId に指定したセッション ID が null です。
 deltaRequest.wrongPrincipalClass=ClusterManagerはGenericPrincipalのみをサポートします。 
あなたのRealmはプリンシパルクラス[{0}]を使用しました。
 
-deltaSession.notifying=クラスタにセッションの有効期限を通知する:primary = [{0}]、sessionId [{1}]
 deltaSession.readSession=readObject() はセッション [{0}] を読み込みました。
 deltaSession.writeSession=writeObject() によりセッション [{0}] を格納しました。
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
index 571e6fb..8e82d0c 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
@@ -69,7 +69,6 @@ deltaRequest.ssid.mismatch=세션 ID가 일치하지 않아, 델타 요청을 
 deltaRequest.ssid.null=setSessionId를 위한 세션 ID가 널입니다.
 deltaRequest.wrongPrincipalClass=ClusterManager는 오직 GenericP

[tomcat] branch 9.0.x updated: BZ65144: Fix debug string

2021-02-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm 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 4dba4d5  BZ65144: Fix debug string
4dba4d5 is described below

commit 4dba4d57f6a1ee0f5f2012195640255d59ee2cb9
Author: remm 
AuthorDate: Tue Feb 16 14:22:29 2021 +0100

BZ65144: Fix debug string
---
 java/org/apache/catalina/ha/session/LocalStrings.properties   | 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_es.properties| 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_fr.properties| 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_ja.properties| 1 -
 java/org/apache/catalina/ha/session/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties | 1 -
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 7b614d6..5ba274a 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -69,7 +69,7 @@ deltaRequest.ssid.mismatch=Session id mismatch, not executing 
the delta request
 deltaRequest.ssid.null=Session Id is null for setSessionId
 deltaRequest.wrongPrincipalClass=ClusterManager only support GenericPrincipal. 
Your realm used principal class [{0}].
 
-deltaSession.notifying=Notifying cluster of session expiration: primary=[{0}], 
sessionId [{1}]
+deltaSession.notifying=Notifying cluster of session expiration: manager [{0}], 
primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() loading session [{0}]
 deltaSession.writeSession=writeObject() storing session [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
index 294fc14..0241e69 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
@@ -60,7 +60,7 @@ deltaRequest.removeUnable=Imposible eliminar elemento:
 deltaRequest.showPrincipal=El Principal [{0}] está puesto a sesión [{1}]
 deltaRequest.wrongPrincipalClass=DeltaManager sólo soporta GenericPrincipal. 
Tu reino utilizó clase principal [{0}].
 
-deltaSession.notifying=Notificando clúster de expiración primaria=[{0}] 
sessionId [{1}]
+deltaSession.notifying=Notificando clúster de expiración manager [{0}], 
primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() cargando sesión [{0}]
 deltaSession.writeSession=writeObject() guardando sesión [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
index bb5e9fe..8ef53cf 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
@@ -69,7 +69,7 @@ deltaRequest.ssid.mismatch=L'id de session ne correspond pas, 
la requête delta
 deltaRequest.ssid.null=L'id de session est null pour setSessionId
 deltaRequest.wrongPrincipalClass=Un ClusterManager n''accepte que des 
GenericPrincipal. Votre realm a utilisé la classe de "principal" [{0}]
 
-deltaSession.notifying=Notification du cluster de l''expiration de la session 
: primaire=[{0}] sessionId [{1}]
+deltaSession.notifying=Notification du cluster de l''expiration de la session 
: manager [{0}], primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() charge la session [{0}]
 deltaSession.writeSession=writeObject() stocke la session [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
index 9c3f3eb..c520ce2 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
@@ -69,7 +69,6 @@ deltaRequest.ssid.mismatch=セッションIDが一致しません。デルタリ
 deltaRequest.ssid.null=setSessionId に指定したセッション ID が null です。
 deltaRequest.wrongPrincipalClass=ClusterManagerはGenericPrincipalのみをサポートします。 
あなたのRealmはプリンシパルクラス[{0}]を使用しました。
 
-deltaSession.notifying=クラスタにセッションの有効期限を通知する:primary = [{0}]、sessionId [{1}]
 deltaSession.readSession=readObject() はセッション [{0}] を読み込みました。
 deltaSession.writeSession=writeObject() によりセッション [{0}] を格納しました。
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
index 571e6fb..8e82d0c 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
@@ -69,7 +69,6 @@ deltaRequest.ssid.mismatch=세션 ID가 일치하지 않아, 델타 요청을 
 deltaRequest.ssid.null=setSessionId를 위한 세션 ID가 널입니다.
 deltaRequest.wrongPrincipalClass=ClusterManager는 오직 GenericPri

[tomcat] branch 8.5.x updated: BZ65144: Fix debug string

2021-02-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 15590ba  BZ65144: Fix debug string
15590ba is described below

commit 15590bae086dd9fc6470cf5f17284779c9c10b11
Author: remm 
AuthorDate: Tue Feb 16 14:22:29 2021 +0100

BZ65144: Fix debug string
---
 java/org/apache/catalina/ha/session/LocalStrings.properties   | 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_es.properties| 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_fr.properties| 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_ja.properties| 1 -
 java/org/apache/catalina/ha/session/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties | 1 -
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 7b614d6..5ba274a 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -69,7 +69,7 @@ deltaRequest.ssid.mismatch=Session id mismatch, not executing 
the delta request
 deltaRequest.ssid.null=Session Id is null for setSessionId
 deltaRequest.wrongPrincipalClass=ClusterManager only support GenericPrincipal. 
Your realm used principal class [{0}].
 
-deltaSession.notifying=Notifying cluster of session expiration: primary=[{0}], 
sessionId [{1}]
+deltaSession.notifying=Notifying cluster of session expiration: manager [{0}], 
primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() loading session [{0}]
 deltaSession.writeSession=writeObject() storing session [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
index 294fc14..0241e69 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
@@ -60,7 +60,7 @@ deltaRequest.removeUnable=Imposible eliminar elemento:
 deltaRequest.showPrincipal=El Principal [{0}] está puesto a sesión [{1}]
 deltaRequest.wrongPrincipalClass=DeltaManager sólo soporta GenericPrincipal. 
Tu reino utilizó clase principal [{0}].
 
-deltaSession.notifying=Notificando clúster de expiración primaria=[{0}] 
sessionId [{1}]
+deltaSession.notifying=Notificando clúster de expiración manager [{0}], 
primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() cargando sesión [{0}]
 deltaSession.writeSession=writeObject() guardando sesión [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
index bb5e9fe..8ef53cf 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
@@ -69,7 +69,7 @@ deltaRequest.ssid.mismatch=L'id de session ne correspond pas, 
la requête delta
 deltaRequest.ssid.null=L'id de session est null pour setSessionId
 deltaRequest.wrongPrincipalClass=Un ClusterManager n''accepte que des 
GenericPrincipal. Votre realm a utilisé la classe de "principal" [{0}]
 
-deltaSession.notifying=Notification du cluster de l''expiration de la session 
: primaire=[{0}] sessionId [{1}]
+deltaSession.notifying=Notification du cluster de l''expiration de la session 
: manager [{0}], primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() charge la session [{0}]
 deltaSession.writeSession=writeObject() stocke la session [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
index 9c3f3eb..c520ce2 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
@@ -69,7 +69,6 @@ deltaRequest.ssid.mismatch=セッションIDが一致しません。デルタリ
 deltaRequest.ssid.null=setSessionId に指定したセッション ID が null です。
 deltaRequest.wrongPrincipalClass=ClusterManagerはGenericPrincipalのみをサポートします。 
あなたのRealmはプリンシパルクラス[{0}]を使用しました。
 
-deltaSession.notifying=クラスタにセッションの有効期限を通知する:primary = [{0}]、sessionId [{1}]
 deltaSession.readSession=readObject() はセッション [{0}] を読み込みました。
 deltaSession.writeSession=writeObject() によりセッション [{0}] を格納しました。
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
index 571e6fb..8e82d0c 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
@@ -69,7 +69,6 @@ deltaRequest.ssid.mismatch=세션 ID가 일치하지 않아, 델타 요청을 
 deltaRequest.ssid.null=setSessionId를 위한 세션 ID가 널입니다.
 deltaRequest.wrongPrincipalClass=ClusterManager는 오직 GenericPri

[tomcat] branch 7.0.x updated: BZ65144: Fix debug string

2021-02-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new e539105  BZ65144: Fix debug string
e539105 is described below

commit e539105d13f170a53eb97bedf9dd4613917cc5da
Author: remm 
AuthorDate: Tue Feb 16 14:22:29 2021 +0100

BZ65144: Fix debug string
---
 java/org/apache/catalina/ha/session/LocalStrings.properties   | 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_es.properties| 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_fr.properties| 2 +-
 java/org/apache/catalina/ha/session/LocalStrings_ja.properties| 1 -
 java/org/apache/catalina/ha/session/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties | 1 -
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 5703b36..37e2db2 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -65,7 +65,7 @@ deltaManager.waitForSessionState=Manager [{0}], requesting 
session state from [{
 deltaRequest.showPrincipal=Principal [{0}] is set to session [{1}]
 deltaRequest.wrongPrincipalClass=ClusterManager only support GenericPrincipal. 
Your realm used principal class [{0}].
 
-deltaSession.notifying=Notifying cluster of session expiration: primary=[{0}], 
sessionId [{1}]
+deltaSession.notifying=Notifying cluster of session expiration: manager [{0}], 
primary [{1}], sessionId [{2}]
 deltaSession.readAttribute=session [{0}] loading attribute [{1}] with value 
[{2}]
 deltaSession.readSession=readObject() loading session [{0}]
 deltaSession.valueBinding.ex=Session binding listener throw an exception
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
index ee86796..6951f88 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_es.properties
@@ -61,7 +61,7 @@ deltaManager.waitForSessionState=Gestor [{0}], requiriendo 
estado de sesión des
 deltaRequest.showPrincipal=El Principal [{0}] está puesto a sesión [{1}]
 deltaRequest.wrongPrincipalClass=DeltaManager sólo soporta GenericPrincipal. 
Tu reino utilizó clase principal [{0}].
 
-deltaSession.notifying=Notificando clúster de expiración primaria=[{0}] 
sessionId [{1}]
+deltaSession.notifying=Notificando clúster de expiración manager [{0}], 
primary [{1}], sessionId [{2}]
 deltaSession.readAttribute=sesión [{0}] cargando atributo [{1}] con valor [{2}]
 deltaSession.readSession=readObject() cargando sesión [{0}]
 deltaSession.valueBinding.ex=Oyente ligándose a sesión lanzó una excepción
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
index 64188ad..8f91220 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
@@ -63,7 +63,7 @@ deltaManager.waitForSessionState=Gestionnaire de session 
[{0}], demande de l''é
 deltaRequest.showPrincipal=Le principal [{0}] est associé à la session [{1}]
 deltaRequest.wrongPrincipalClass=Un ClusterManager n''accepte que des 
GenericPrincipal. Votre realm a utilisé la classe de "principal" [{0}]
 
-deltaSession.notifying=Notification du cluster de l''expiration de la session 
: primaire=[{0}] sessionId [{1}]
+deltaSession.notifying=Notification du cluster de l''expiration de la session 
: manager [{0}], primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() charge la session [{0}]
 deltaSession.writeSession=writeObject() stocke la session [{0}]
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
index 98f8a2f..c12a25d 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
@@ -63,7 +63,6 @@ deltaManager.waitForSessionState=Manager[{0}]、[{1}]からのセッション状
 deltaRequest.showPrincipal=プリンシパル [{0}]はセッション [{1}]に設定されています
 deltaRequest.wrongPrincipalClass=ClusterManagerはGenericPrincipalのみをサポートします。 
あなたのRealmはプリンシパルクラス[{0}]を使用しました。
 
-deltaSession.notifying=クラスタにセッションの有効期限を通知する:primary = [{0}]、sessionId [{1}]
 deltaSession.readSession=readObject() はセッション [{0}] を読み込みました。
 deltaSession.writeSession=writeObject() によりセッション [{0}] を格納しました。
 
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties 
b/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
index e70522e..7a55ee5 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
+++ b/java

[Bug 65144] deltaSession.notifying: Format string/argument mismatch

2021-02-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65144

Remy Maucherat  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Remy Maucherat  ---
The fixed string will be in Tomcat 10.0.3, 9.0.44, 8.5.64 and 7.0.109.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot failure in on tomcat-trunk

2021-02-16 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/5682

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 01ceebb8e2aeaad7eea97982900928a3dbaf3056
Blamelist: remm 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



Re: buildbot failure in on tomcat-trunk

2021-02-16 Thread Rémy Maucherat
On Tue, Feb 16, 2021 at 3:54 PM  wrote:

> The Buildbot has detected a new failure on builder tomcat-trunk while
> building tomcat. Full details are available at:
> https://ci.apache.org/builders/tomcat-trunk/builds/5682
>
> Buildbot URL: https://ci.apache.org/
>
> Buildslave for this Build: asf946_ubuntu
>
> Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit'
> triggered this build
> Build Source Stamp: [branch master]
> 01ceebb8e2aeaad7eea97982900928a3dbaf3056
> Blamelist: remm 
>
> BUILD FAILED: failed compile_1
>

A certificate has expired.
https://ci.apache.org/projects/tomcat/tomcat10/logs/5682/TEST-org.apache.tomcat.util.net.TestSSLHostConfigCompat.NIO.txt

Rémy


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


buildbot failure in on tomcat-9-trunk

2021-02-16 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/649

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 4dba4d57f6a1ee0f5f2012195640255d59ee2cb9
Blamelist: remm 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



[tomcat] branch master updated: Allow casual runtime use of the migration tool

2021-02-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm 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 abd1dea  Allow casual runtime use of the migration tool
abd1dea is described below

commit abd1dead7804e99e3215e8e01a6cf7448a6b9f36
Author: remm 
AuthorDate: Tue Feb 16 17:06:27 2021 +0100

Allow casual runtime use of the migration tool

This allows specifying a profile which will be used for a
ClassFileTransformer. Nothing much to report, it does basic things but
does not do classloader resources or static files.
---
 .../apache/catalina/loader/LocalStrings.properties |  1 +
 java/org/apache/catalina/loader/WebappLoader.java  | 57 ++
 webapps/docs/changelog.xml |  7 +++
 webapps/docs/config/loader.xml | 11 +
 4 files changed, 76 insertions(+)

diff --git a/java/org/apache/catalina/loader/LocalStrings.properties 
b/java/org/apache/catalina/loader/LocalStrings.properties
index 7c6c976..dee7e2c 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -59,6 +59,7 @@ webappClassLoader.wrongVersion=(unable to load class [{0}])
 webappClassLoaderParallel.registrationFailed=Registration of 
org.apache.catalina.loader.ParallelWebappClassLoader as capable of loading 
classes in parallel failed
 
 webappLoader.deploy=Deploying class repositories to work directory [{0}]
+webappLoader.noJakartaConverter=The Jakarta converter provided by the Tomcat 
migration tool could not be loaded
 webappLoader.noResources=No resources found for context [{0}]
 webappLoader.reloadable=Cannot set reloadable property to [{0}]
 webappLoader.setContext.ise=Setting the Context is not permitted while the 
loader is started.
diff --git a/java/org/apache/catalina/loader/WebappLoader.java 
b/java/org/apache/catalina/loader/WebappLoader.java
index 636c741..b262db9 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -21,7 +21,10 @@ import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.io.FilePermission;
 import java.io.IOException;
+import java.lang.instrument.ClassFileTransformer;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.charset.StandardCharsets;
@@ -87,6 +90,14 @@ public class WebappLoader extends LifecycleMBeanBase 
implements Loader{
 
 
 /**
+ * The profile name which will be used by the converter, or null if not 
used.
+ * Any invalid profile value will default to the TOMCAT profile, which
+ * converts all packages used by Tomcat.
+ */
+private String jakartaConverter = null;
+
+
+/**
  * The Java class name of the ClassLoader implementation to be used.
  * This class should extend WebappClassLoaderBase, otherwise, a different
  * loader implementation must be used.
@@ -173,6 +184,32 @@ public class WebappLoader extends LifecycleMBeanBase 
implements Loader{
 
 
 /**
+ * @return a non null String if the loader will attempt to use the
+ *  Jakarta converter. The String is the name of the profile
+ *  used for conversion.
+ */
+public String getJakartaConverter() {
+return jakartaConverter;
+}
+
+
+/**
+ * Set the Jakarta converter.
+ *
+ * @param jakartaConverter The profile name which will be used by the 
converter
+ *   Any invalid profile value will default to the TOMCAT profile, which
+ *   converts all packages used by Tomcat.
+ */
+public void setJakartaConverter(String jakartaConverter) {
+String oldJakartaConverter = this.jakartaConverter;
+this.jakartaConverter = jakartaConverter;
+support.firePropertyChange("jakartaConverter",
+oldJakartaConverter,
+this.jakartaConverter);
+}
+
+
+/**
  * @return the ClassLoader class name.
  */
 public String getLoaderClass() {
@@ -327,6 +364,26 @@ public class WebappLoader extends LifecycleMBeanBase 
implements Loader{
 classLoader.setResources(context.getResources());
 classLoader.setDelegate(this.delegate);
 
+// Set Jakarta class converter
+if (getJakartaConverter() != null) {
+try {
+Class jakartaEnumClass = 
Class.forName("org.apache.tomcat.jakartaee.EESpecProfile");
+Method valueOf = jakartaEnumClass.getMethod("valueOf", 
String.class);
+Object profile = null;
+try {
+profile = valueOf.invoke(null, getJakartaConverter());
+} catch (InvocationTargetException ignored) {
+