[tomcat] branch main updated: Fix accuracy of replication statistics

2023-09-26 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new b5bdb1be34 Fix accuracy of replication statistics
b5bdb1be34 is described below

commit b5bdb1be341d251bf82c2fa12c1e247125443892
Author: remm 
AuthorDate: Tue Sep 26 11:06:14 2023 +0200

Fix accuracy of replication statistics

The stats are disabled by default now, so although the javadoc said it
is inaccurate on purpose, it now makes more sense to address it.
Found by coverity.
---
 .../apache/catalina/ha/tcp/ReplicationValve.java   | 76 ++
 1 file changed, 36 insertions(+), 40 deletions(-)

diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java 
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index b466d6524d..1ce063c81b 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
@@ -90,18 +92,13 @@ public class ReplicationValve extends ValveBase implements 
ClusterValve {
  */
 protected boolean doProcessingStats = false;
 
-/*
- * Note: The statistics are volatile to ensure the concurrent updates do 
not corrupt them but it is still possible
- * that: - some updates may be lost; - the individual statistics may not 
be consistent which each other. This is a
- * deliberate design choice to reduce the requirement for synchronization.
- */
-protected volatile long totalRequestTime = 0;
-protected volatile long totalSendTime = 0;
-protected volatile long nrOfRequests = 0;
-protected volatile long lastSendTime = 0;
-protected volatile long nrOfFilterRequests = 0;
-protected volatile long nrOfSendRequests = 0;
-protected volatile long nrOfCrossContextSendRequests = 0;
+protected LongAdder totalRequestTime = new LongAdder();
+protected LongAdder totalSendTime = new LongAdder();
+protected LongAdder nrOfRequests = new LongAdder();
+protected AtomicLong lastSendTime = new AtomicLong();
+protected LongAdder nrOfFilterRequests = new LongAdder();
+protected LongAdder nrOfSendRequests = new LongAdder();
+protected LongAdder nrOfCrossContextSendRequests = new LongAdder();
 
 /**
  * must primary change indicator set
@@ -220,49 +217,49 @@ public class ReplicationValve extends ValveBase 
implements ClusterValve {
  * @return the lastSendTime.
  */
 public long getLastSendTime() {
-return lastSendTime;
+return lastSendTime.longValue();
 }
 
 /**
  * @return the nrOfRequests.
  */
 public long getNrOfRequests() {
-return nrOfRequests;
+return nrOfRequests.longValue();
 }
 
 /**
  * @return the nrOfFilterRequests.
  */
 public long getNrOfFilterRequests() {
-return nrOfFilterRequests;
+return nrOfFilterRequests.longValue();
 }
 
 /**
  * @return the nrOfCrossContextSendRequests.
  */
 public long getNrOfCrossContextSendRequests() {
-return nrOfCrossContextSendRequests;
+return nrOfCrossContextSendRequests.longValue();
 }
 
 /**
  * @return the nrOfSendRequests.
  */
 public long getNrOfSendRequests() {
-return nrOfSendRequests;
+return nrOfSendRequests.longValue();
 }
 
 /**
  * @return the totalRequestTime.
  */
 public long getTotalRequestTime() {
-return totalRequestTime;
+return totalRequestTime.longValue();
 }
 
 /**
  * @return the totalSendTime.
  */
 public long getTotalSendTime() {
-return totalSendTime;
+return totalSendTime.longValue();
 }
 
 // - Public Methods
@@ -349,13 +346,13 @@ public class ReplicationValve extends ValveBase 
implements ClusterValve {
  * reset the active statistics
  */
 public void resetStatistics() {
-totalRequestTime = 0;
-totalSendTime = 0;
-lastSendTime = 0;
-nrOfFilterRequests = 0;
-nrOfRequests = 0;
-nrOfSendRequests = 0;
-nrOfCrossContextSendRequests = 0;
+totalRequestTime.reset();
+totalSendTime.reset();
+lastSendTime.set(0);
+nrOfFilterRequests.reset();
+nrOfRequests.reset();
+nrOfSendRequests.reset();
+nrOfCrossContextSendRequests.reset();
 }
 
 /**
@@ -405,7 +402,6 @@ public class ReplicationValve extends ValveBase implements 
ClusterValve {
 // FIXME we have a lot of sends, but

[tomcat] branch 10.1.x updated: Fix accuracy of replication statistics

2023-09-26 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm 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 616ee441e0 Fix accuracy of replication statistics
616ee441e0 is described below

commit 616ee441e03e27053647a6272eef9a48b92d4074
Author: remm 
AuthorDate: Tue Sep 26 11:06:14 2023 +0200

Fix accuracy of replication statistics

The stats are disabled by default now, so although the javadoc said it
is inaccurate on purpose, it now makes more sense to address it.
Found by coverity.
---
 .../apache/catalina/ha/tcp/ReplicationValve.java   | 76 ++
 1 file changed, 36 insertions(+), 40 deletions(-)

diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java 
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index b466d6524d..1ce063c81b 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
@@ -90,18 +92,13 @@ public class ReplicationValve extends ValveBase implements 
ClusterValve {
  */
 protected boolean doProcessingStats = false;
 
-/*
- * Note: The statistics are volatile to ensure the concurrent updates do 
not corrupt them but it is still possible
- * that: - some updates may be lost; - the individual statistics may not 
be consistent which each other. This is a
- * deliberate design choice to reduce the requirement for synchronization.
- */
-protected volatile long totalRequestTime = 0;
-protected volatile long totalSendTime = 0;
-protected volatile long nrOfRequests = 0;
-protected volatile long lastSendTime = 0;
-protected volatile long nrOfFilterRequests = 0;
-protected volatile long nrOfSendRequests = 0;
-protected volatile long nrOfCrossContextSendRequests = 0;
+protected LongAdder totalRequestTime = new LongAdder();
+protected LongAdder totalSendTime = new LongAdder();
+protected LongAdder nrOfRequests = new LongAdder();
+protected AtomicLong lastSendTime = new AtomicLong();
+protected LongAdder nrOfFilterRequests = new LongAdder();
+protected LongAdder nrOfSendRequests = new LongAdder();
+protected LongAdder nrOfCrossContextSendRequests = new LongAdder();
 
 /**
  * must primary change indicator set
@@ -220,49 +217,49 @@ public class ReplicationValve extends ValveBase 
implements ClusterValve {
  * @return the lastSendTime.
  */
 public long getLastSendTime() {
-return lastSendTime;
+return lastSendTime.longValue();
 }
 
 /**
  * @return the nrOfRequests.
  */
 public long getNrOfRequests() {
-return nrOfRequests;
+return nrOfRequests.longValue();
 }
 
 /**
  * @return the nrOfFilterRequests.
  */
 public long getNrOfFilterRequests() {
-return nrOfFilterRequests;
+return nrOfFilterRequests.longValue();
 }
 
 /**
  * @return the nrOfCrossContextSendRequests.
  */
 public long getNrOfCrossContextSendRequests() {
-return nrOfCrossContextSendRequests;
+return nrOfCrossContextSendRequests.longValue();
 }
 
 /**
  * @return the nrOfSendRequests.
  */
 public long getNrOfSendRequests() {
-return nrOfSendRequests;
+return nrOfSendRequests.longValue();
 }
 
 /**
  * @return the totalRequestTime.
  */
 public long getTotalRequestTime() {
-return totalRequestTime;
+return totalRequestTime.longValue();
 }
 
 /**
  * @return the totalSendTime.
  */
 public long getTotalSendTime() {
-return totalSendTime;
+return totalSendTime.longValue();
 }
 
 // - Public Methods
@@ -349,13 +346,13 @@ public class ReplicationValve extends ValveBase 
implements ClusterValve {
  * reset the active statistics
  */
 public void resetStatistics() {
-totalRequestTime = 0;
-totalSendTime = 0;
-lastSendTime = 0;
-nrOfFilterRequests = 0;
-nrOfRequests = 0;
-nrOfSendRequests = 0;
-nrOfCrossContextSendRequests = 0;
+totalRequestTime.reset();
+totalSendTime.reset();
+lastSendTime.set(0);
+nrOfFilterRequests.reset();
+nrOfRequests.reset();
+nrOfSendRequests.reset();
+nrOfCrossContextSendRequests.reset();
 }
 
 /**
@@ -405,7 +402,6 @@ public class ReplicationValve extends ValveBase implements 
ClusterValve {
 // FIXME we have a lot of sends,

[tomcat] branch 9.0.x updated: Fix accuracy of replication statistics

2023-09-26 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 f1abb4605d Fix accuracy of replication statistics
f1abb4605d is described below

commit f1abb4605dfe33036a761d4e90b5323d6b6ed3eb
Author: remm 
AuthorDate: Tue Sep 26 11:06:14 2023 +0200

Fix accuracy of replication statistics

The stats are disabled by default now, so although the javadoc said it
is inaccurate on purpose, it now makes more sense to address it.
Found by coverity.
---
 .../apache/catalina/ha/tcp/ReplicationValve.java   | 76 ++
 1 file changed, 36 insertions(+), 40 deletions(-)

diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java 
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 1f7749f88e..84a44b98ac 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
@@ -90,18 +92,13 @@ public class ReplicationValve extends ValveBase implements 
ClusterValve {
  */
 protected boolean doProcessingStats = false;
 
-/*
- * Note: The statistics are volatile to ensure the concurrent updates do 
not corrupt them but it is still possible
- * that: - some updates may be lost; - the individual statistics may not 
be consistent which each other. This is a
- * deliberate design choice to reduce the requirement for synchronization.
- */
-protected volatile long totalRequestTime = 0;
-protected volatile long totalSendTime = 0;
-protected volatile long nrOfRequests = 0;
-protected volatile long lastSendTime = 0;
-protected volatile long nrOfFilterRequests = 0;
-protected volatile long nrOfSendRequests = 0;
-protected volatile long nrOfCrossContextSendRequests = 0;
+protected LongAdder totalRequestTime = new LongAdder();
+protected LongAdder totalSendTime = new LongAdder();
+protected LongAdder nrOfRequests = new LongAdder();
+protected AtomicLong lastSendTime = new AtomicLong();
+protected LongAdder nrOfFilterRequests = new LongAdder();
+protected LongAdder nrOfSendRequests = new LongAdder();
+protected LongAdder nrOfCrossContextSendRequests = new LongAdder();
 
 /**
  * must primary change indicator set
@@ -220,49 +217,49 @@ public class ReplicationValve extends ValveBase 
implements ClusterValve {
  * @return the lastSendTime.
  */
 public long getLastSendTime() {
-return lastSendTime;
+return lastSendTime.longValue();
 }
 
 /**
  * @return the nrOfRequests.
  */
 public long getNrOfRequests() {
-return nrOfRequests;
+return nrOfRequests.longValue();
 }
 
 /**
  * @return the nrOfFilterRequests.
  */
 public long getNrOfFilterRequests() {
-return nrOfFilterRequests;
+return nrOfFilterRequests.longValue();
 }
 
 /**
  * @return the nrOfCrossContextSendRequests.
  */
 public long getNrOfCrossContextSendRequests() {
-return nrOfCrossContextSendRequests;
+return nrOfCrossContextSendRequests.longValue();
 }
 
 /**
  * @return the nrOfSendRequests.
  */
 public long getNrOfSendRequests() {
-return nrOfSendRequests;
+return nrOfSendRequests.longValue();
 }
 
 /**
  * @return the totalRequestTime.
  */
 public long getTotalRequestTime() {
-return totalRequestTime;
+return totalRequestTime.longValue();
 }
 
 /**
  * @return the totalSendTime.
  */
 public long getTotalSendTime() {
-return totalSendTime;
+return totalSendTime.longValue();
 }
 
 // - Public Methods
@@ -349,13 +346,13 @@ public class ReplicationValve extends ValveBase 
implements ClusterValve {
  * reset the active statistics
  */
 public void resetStatistics() {
-totalRequestTime = 0;
-totalSendTime = 0;
-lastSendTime = 0;
-nrOfFilterRequests = 0;
-nrOfRequests = 0;
-nrOfSendRequests = 0;
-nrOfCrossContextSendRequests = 0;
+totalRequestTime.reset();
+totalSendTime.reset();
+lastSendTime.set(0);
+nrOfFilterRequests.reset();
+nrOfRequests.reset();
+nrOfSendRequests.reset();
+nrOfCrossContextSendRequests.reset();
 }
 
 /**
@@ -405,7 +402,6 @@ public class ReplicationValve extends ValveBase implements 
ClusterValve {
 // FIXME we have a lot of sends, b

[tomcat] branch main updated: Fix syncs for mapMembers

2023-09-26 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new c858503c14 Fix syncs for mapMembers
c858503c14 is described below

commit c858503c140e9186ef663acb1b58b61430c4d488
Author: remm 
AuthorDate: Tue Sep 26 11:51:55 2023 +0200

Fix syncs for mapMembers

Found by coverity.
---
 .../tribes/tipis/AbstractReplicatedMap.java| 32 --
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 333f3ae6c8..47daef11ed 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -389,7 +389,9 @@ public abstract class AbstractReplicatedMap
 }
 this.rpcChannel = null;
 this.channel = null;
-this.mapMembers.clear();
+synchronized (mapMembers) {
+this.mapMembers.clear();
+}
 innerMap.clear();
 this.stateTransferred = false;
 this.externalLoaders = null;
@@ -417,12 +419,12 @@ public abstract class AbstractReplicatedMap
 //  GROUP COM INTERFACES
 
//--
 public Member[] getMapMembers(HashMap members) {
-synchronized (members) {
-return members.keySet().toArray(new Member[0]);
-}
+return members.keySet().toArray(new Member[0]);
 }
 public Member[] getMapMembers() {
-return getMapMembers(this.mapMembers);
+synchronized (mapMembers) {
+return getMapMembers(mapMembers);
+}
 }
 
 public Member[] getMapMembersExcl(Member[] exclude) {
@@ -970,16 +972,18 @@ public abstract class AbstractReplicatedMap
 }
 
 public int getNextBackupIndex() {
-int size = mapMembers.size();
-if (mapMembers.size() == 0) {
-return -1;
-}
-int node = currentNode++;
-if (node >= size) {
-node = 0;
-currentNode = 1;
+synchronized (mapMembers) {
+int size = mapMembers.size();
+if (mapMembers.size() == 0) {
+return -1;
+}
+int node = currentNode++;
+if (node >= size) {
+node = 0;
+currentNode = 1;
+}
+return node;
 }
-return node;
 }
 public Member getNextBackupNode() {
 Member[] members = getMapMembers();


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

[tomcat] branch 10.1.x updated: Fix syncs for mapMembers

2023-09-26 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm 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 c91d744cd3 Fix syncs for mapMembers
c91d744cd3 is described below

commit c91d744cd35ad00be13bafdeb781d8be2f88db51
Author: remm 
AuthorDate: Tue Sep 26 11:51:55 2023 +0200

Fix syncs for mapMembers

Found by coverity.
---
 .../tribes/tipis/AbstractReplicatedMap.java| 32 --
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 333f3ae6c8..47daef11ed 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -389,7 +389,9 @@ public abstract class AbstractReplicatedMap
 }
 this.rpcChannel = null;
 this.channel = null;
-this.mapMembers.clear();
+synchronized (mapMembers) {
+this.mapMembers.clear();
+}
 innerMap.clear();
 this.stateTransferred = false;
 this.externalLoaders = null;
@@ -417,12 +419,12 @@ public abstract class AbstractReplicatedMap
 //  GROUP COM INTERFACES
 
//--
 public Member[] getMapMembers(HashMap members) {
-synchronized (members) {
-return members.keySet().toArray(new Member[0]);
-}
+return members.keySet().toArray(new Member[0]);
 }
 public Member[] getMapMembers() {
-return getMapMembers(this.mapMembers);
+synchronized (mapMembers) {
+return getMapMembers(mapMembers);
+}
 }
 
 public Member[] getMapMembersExcl(Member[] exclude) {
@@ -970,16 +972,18 @@ public abstract class AbstractReplicatedMap
 }
 
 public int getNextBackupIndex() {
-int size = mapMembers.size();
-if (mapMembers.size() == 0) {
-return -1;
-}
-int node = currentNode++;
-if (node >= size) {
-node = 0;
-currentNode = 1;
+synchronized (mapMembers) {
+int size = mapMembers.size();
+if (mapMembers.size() == 0) {
+return -1;
+}
+int node = currentNode++;
+if (node >= size) {
+node = 0;
+currentNode = 1;
+}
+return node;
 }
-return node;
 }
 public Member getNextBackupNode() {
 Member[] members = getMapMembers();


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

[tomcat] branch 9.0.x updated: Fix syncs for mapMembers

2023-09-26 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 722877ddac Fix syncs for mapMembers
722877ddac is described below

commit 722877ddacabb5086fea951004f905a58106f40b
Author: remm 
AuthorDate: Tue Sep 26 11:51:55 2023 +0200

Fix syncs for mapMembers

Found by coverity.
---
 .../tribes/tipis/AbstractReplicatedMap.java| 32 --
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 333f3ae6c8..47daef11ed 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -389,7 +389,9 @@ public abstract class AbstractReplicatedMap
 }
 this.rpcChannel = null;
 this.channel = null;
-this.mapMembers.clear();
+synchronized (mapMembers) {
+this.mapMembers.clear();
+}
 innerMap.clear();
 this.stateTransferred = false;
 this.externalLoaders = null;
@@ -417,12 +419,12 @@ public abstract class AbstractReplicatedMap
 //  GROUP COM INTERFACES
 
//--
 public Member[] getMapMembers(HashMap members) {
-synchronized (members) {
-return members.keySet().toArray(new Member[0]);
-}
+return members.keySet().toArray(new Member[0]);
 }
 public Member[] getMapMembers() {
-return getMapMembers(this.mapMembers);
+synchronized (mapMembers) {
+return getMapMembers(mapMembers);
+}
 }
 
 public Member[] getMapMembersExcl(Member[] exclude) {
@@ -970,16 +972,18 @@ public abstract class AbstractReplicatedMap
 }
 
 public int getNextBackupIndex() {
-int size = mapMembers.size();
-if (mapMembers.size() == 0) {
-return -1;
-}
-int node = currentNode++;
-if (node >= size) {
-node = 0;
-currentNode = 1;
+synchronized (mapMembers) {
+int size = mapMembers.size();
+if (mapMembers.size() == 0) {
+return -1;
+}
+int node = currentNode++;
+if (node >= size) {
+node = 0;
+currentNode = 1;
+}
+return node;
 }
-return node;
 }
 public Member getNextBackupNode() {
 Member[] members = getMapMembers();


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

[tomcat] branch 8.5.x updated: Fix syncs for mapMembers

2023-09-26 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 d4b3bf71cf Fix syncs for mapMembers
d4b3bf71cf is described below

commit d4b3bf71cf446e6e0e1f0b45226416ce95d23874
Author: remm 
AuthorDate: Tue Sep 26 11:51:55 2023 +0200

Fix syncs for mapMembers

Found by coverity.
---
 .../tribes/tipis/AbstractReplicatedMap.java| 32 --
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index b9de21bc0a..f8a7151d64 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -389,7 +389,9 @@ public abstract class AbstractReplicatedMap
 }
 this.rpcChannel = null;
 this.channel = null;
-this.mapMembers.clear();
+synchronized (mapMembers) {
+this.mapMembers.clear();
+}
 innerMap.clear();
 this.stateTransferred = false;
 this.externalLoaders = null;
@@ -417,12 +419,12 @@ public abstract class AbstractReplicatedMap
 //  GROUP COM INTERFACES
 
//--
 public Member[] getMapMembers(HashMap members) {
-synchronized (members) {
-return members.keySet().toArray(new Member[0]);
-}
+return members.keySet().toArray(new Member[0]);
 }
 public Member[] getMapMembers() {
-return getMapMembers(this.mapMembers);
+synchronized (mapMembers) {
+return getMapMembers(mapMembers);
+}
 }
 
 public Member[] getMapMembersExcl(Member[] exclude) {
@@ -970,16 +972,18 @@ public abstract class AbstractReplicatedMap
 }
 
 public int getNextBackupIndex() {
-int size = mapMembers.size();
-if (mapMembers.size() == 0) {
-return -1;
-}
-int node = currentNode++;
-if (node >= size) {
-node = 0;
-currentNode = 1;
+synchronized (mapMembers) {
+int size = mapMembers.size();
+if (mapMembers.size() == 0) {
+return -1;
+}
+int node = currentNode++;
+if (node >= size) {
+node = 0;
+currentNode = 1;
+}
+return node;
 }
-return node;
 }
 public Member getNextBackupNode() {
 Member[] members = getMapMembers();


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

[Bug 67061] SSLVerifyClient="optionalNoCA" still not doing what it should

2023-09-26 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=67061

--- Comment #2 from Mark Thomas  ---
You need to disable OCSP else optionalNoCA will always fail. Nest the following
in your SSLHostConfig element in server.xml





Tomcat Native should probably (just confirming that with a discussion on the
dev@ list) do this automatically.

-- 
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 Native releases

2023-09-26 Thread Mark Thomas 

Hi all,

With OpenSSL 1.1.1 reaching EOL and there being a low severity issue in 
the OpenSSL versions used in the Windows binaries for the last releases, 
I'd like to propose a new set of Tomcat Native releases that:


- include the fix for BZ 67061
- include binaries built with the latest OpenSSL 3.0.x release
  (Native 1.2.x and 2.0.x)

Note that I don't intend to remove the OpenSSL 1.1.1 support from Tomcat 
Native 1.2.x as it is used by various downstream distributions, just 
build the Windows binaries we provide with the newer OpenSSL binary.


Any objections? If not tagging will probably be tomorrow.

Mark

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

Re: certificateVerification="optionalNoCA" and OCSP validation.

2023-09-26 Thread Mark Thomas 

Hi,

This is an old thread (2021) but relevant to BZ 67061 [1].

In short, optionalNoCA doesn't work unless OCSP is also disabled.

Do we:

a) Always skip the OCSP check if optionalNoCA is used (and document this 
for optionalNoCA)?


b) Leave the code unchanged and document that using optionalNoCA also 
requires OCSP to be explicitly disabled?


My understanding from the 2021 thread is that we agreed to implement a) 
although it looks like that never happened.


Unless there are objections, I intend to implement a) shortly.

Mark


[1] https://bz.apache.org/bugzilla/show_bug.cgi?id=67061

On 30/06/2021 15:09, jean-frederic clere wrote:

On 29/06/2021 18:22, Mark Thomas wrote:

On 29/06/2021 15:19, jean-frederic clere wrote:

On 29/06/2021 14:45, Mark Thomas wrote:

On 29/06/2021 12:29, jean-frederic clere wrote:

Hi,

It seems certificateVerification="optionalNoCA" only works if the 
OCSP is disabled.

   
 
   
In 

Otherwise the OCSP check forces an error because it can't check 
anything...


How to "fix" that? Just document it? or return OK where we test 
SSL_CVERIFY_OPTIONAL_NO_CA 
(https://github.com/apache/tomcat-native/blob/main/native/src/sslutils.c#L337)?


Hmm.

My expectation is that:

- certificate provided results in OCSP for that cert and the connection
   fails if the check fails.


certificateVerification="optional" makes the client certificate 
optional (required by webapps if needed).


certificateVerification="optionalNoCA" does the same and additionally 
should avoid checking the client against the CA.
The OCSP checking needs to validate the client certificate against 
the CA otherwise it will prevent getting the connection, making NoCA 
like ignored...


Got it. In which case I'll change my expectation to optionalNoCA == no 
OCSP check. We should document this.


OK I will fix the code and document it.



Mark

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






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

Re: certificateVerification="optionalNoCA" and OCSP validation.

2023-09-26 Thread Michael Osipov 
On 2023/09/26 10:48:23 Mark Thomas wrote:
> Hi,
> 
> This is an old thread (2021) but relevant to BZ 67061 [1].
> 
> In short, optionalNoCA doesn't work unless OCSP is also disabled.
> 
> Do we:
> 
> a) Always skip the OCSP check if optionalNoCA is used (and document this 
> for optionalNoCA)?
> 
> b) Leave the code unchanged and document that using optionalNoCA also 
> requires OCSP to be explicitly disabled?
> 
> My understanding from the 2021 thread is that we agreed to implement a) 
> although it looks like that never happened.
> 
> Unless there are objections, I intend to implement a) shortly.

I tripped over this two years ago and was suprised was the Tomcat responses are 
so slow, it turned out:
* our OCSP responder was abysmally slow
* OCSP check was *enabled* by default and only a hack by Rainer did disable it.

I would highly prefer that we have the logical equivalent of 
https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslocspenable (attribute 
"ocspEnable" or alike in consistence of other attributes), not even speaking 
about the other options.

Michael

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

[Bug 67061] SSLVerifyClient="optionalNoCA" still not doing what it should

2023-09-26 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=67061

Michael Osipov  changed:

   What|Removed |Added

 CC||micha...@apache.org

-- 
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

Re: Tomcat Native releases

2023-09-26 Thread Michael Osipov 
On 2023/09/26 10:47:34 Mark Thomas wrote:
> Hi all,
> 
> With OpenSSL 1.1.1 reaching EOL and there being a low severity issue in 
> the OpenSSL versions used in the Windows binaries for the last releases, 
> I'd like to propose a new set of Tomcat Native releases that:
> 
> - include the fix for BZ 67061
> - include binaries built with the latest OpenSSL 3.0.x release
>(Native 1.2.x and 2.0.x)
> 
> Note that I don't intend to remove the OpenSSL 1.1.1 support from Tomcat 
> Native 1.2.x as it is used by various downstream distributions, just 
> build the Windows binaries we provide with the newer OpenSSL binary.
> 
> Any objections? If not tagging will probably be tomorrow.

This is good news and will clear grounds since I am currently working on Bug 
66670 which might require a change in Tomcat Native.

Michael

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

[tomcat] branch main updated: Code clean-up - no functional change

2023-09-26 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new ffb39221e5 Code clean-up - no functional change
ffb39221e5 is described below

commit ffb39221e535a986523db742289e9de2afe93feb
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:19:47 2023 +0100

Code clean-up - no functional change
---
 java/org/apache/catalina/mapper/Mapper.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/mapper/Mapper.java 
b/java/org/apache/catalina/mapper/Mapper.java
index b8708b9c45..40c214fd87 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -83,7 +83,7 @@ public final class Mapper {
 /**
  * Mapping from Context object to Context version to support 
RequestDispatcher mappings.
  */
-private final Map 
contextObjectToContextVersionMap = new ConcurrentHashMap<>();
+private final Map contextObjectToContextVersionMap 
= new ConcurrentHashMap<>();
 
 
 // - Public Methods
@@ -284,8 +284,8 @@ public final class Mapper {
 }
 int slashCount = slashCount(path);
 synchronized (mappedHost) {
-ContextVersion newContextVersion = new ContextVersion(version, 
path, slashCount, context, resources,
-welcomeResources);
+ContextVersion newContextVersion =
+new ContextVersion(version, path, slashCount, context, 
resources, welcomeResources);
 if (wrappers != null) {
 addWrappers(newContextVersion, wrappers);
 }
@@ -1445,8 +1445,7 @@ public final class Mapper {
 /**
  * Insert into the right place in a sorted MapElement array, and prevent 
duplicates.
  */
-private static  boolean insertMap(MapElement[] oldMap, 
MapElement[] newMap,
-MapElement newElement) {
+private static  boolean insertMap(MapElement[] oldMap, 
MapElement[] newMap, MapElement newElement) {
 int pos = find(oldMap, newElement.name);
 if ((pos != -1) && (newElement.name.equals(oldMap[pos].name))) {
 return false;


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

[tomcat] 01/02: Code clean-up - no functional change

2023-09-26 Thread markt 
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

commit ed48a6365ca2255fa658b7b0aa7b435f6d7b8fce
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:20:35 2023 +0100

Code clean-up - no functional change
---
 java/org/apache/catalina/mapper/Mapper.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/mapper/Mapper.java 
b/java/org/apache/catalina/mapper/Mapper.java
index f73e7429b5..c3a4cff8dd 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -71,7 +71,7 @@ public final class Mapper {
 /**
  * Mapping from Context object to Context version to support 
RequestDispatcher mappings.
  */
-private final Map 
contextObjectToContextVersionMap = new ConcurrentHashMap<>();
+private final Map contextObjectToContextVersionMap 
= new ConcurrentHashMap<>();
 
 
 // - Public Methods
@@ -272,8 +272,8 @@ public final class Mapper {
 }
 int slashCount = slashCount(path);
 synchronized (mappedHost) {
-ContextVersion newContextVersion = new ContextVersion(version, 
path, slashCount, context, resources,
-welcomeResources);
+ContextVersion newContextVersion =
+new ContextVersion(version, path, slashCount, context, 
resources, welcomeResources);
 if (wrappers != null) {
 addWrappers(newContextVersion, wrappers);
 }
@@ -1427,8 +1427,7 @@ public final class Mapper {
 /**
  * Insert into the right place in a sorted MapElement array, and prevent 
duplicates.
  */
-private static  boolean insertMap(MapElement[] oldMap, 
MapElement[] newMap,
-MapElement newElement) {
+private static  boolean insertMap(MapElement[] oldMap, 
MapElement[] newMap, MapElement newElement) {
 int pos = find(oldMap, newElement.name);
 if ((pos != -1) && (newElement.name.equals(oldMap[pos].name))) {
 return false;


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

[tomcat] 02/02: Align with 11.0.x

2023-09-26 Thread markt 
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

commit 44891e6e36f8ec2be40c2106b74dcb77b315558a
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:26:49 2023 +0100

Align with 11.0.x
---
 java/org/apache/catalina/mapper/Mapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/mapper/Mapper.java 
b/java/org/apache/catalina/mapper/Mapper.java
index c3a4cff8dd..19f4f7f55a 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -51,8 +51,8 @@ public final class Mapper {
 
 private static final StringManager sm = 
StringManager.getManager(Mapper.class);
 
-// - Instance Variables
 
+// - Instance Variables
 
 /**
  * Array containing the virtual hosts definitions.


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

[tomcat] branch 10.1.x updated (c91d744cd3 -> 44891e6e36)

2023-09-26 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


from c91d744cd3 Fix syncs for mapMembers
 new ed48a6365c Code clean-up - no functional change
 new 44891e6e36 Align with 11.0.x

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/mapper/Mapper.java | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)


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

[tomcat] 02/02: Align with 10.1.x onwards

2023-09-26 Thread markt 
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 fc7f27f54887a11a564a14d2c4caa9a3e778c579
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:27:04 2023 +0100

Align with 10.1.x onwards
---
 java/org/apache/catalina/mapper/Mapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/mapper/Mapper.java 
b/java/org/apache/catalina/mapper/Mapper.java
index 97fe3b9443..61d4c9c177 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -51,8 +51,8 @@ public final class Mapper {
 
 private static final StringManager sm = 
StringManager.getManager(Mapper.class);
 
-// - Instance Variables
 
+// - Instance Variables
 
 /**
  * Array containing the virtual hosts definitions.


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

[tomcat] branch 9.0.x updated (722877ddac -> fc7f27f548)

2023-09-26 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


from 722877ddac Fix syncs for mapMembers
 new 76b84bc153 Code clean-up - no functional change
 new fc7f27f548 Align with 10.1.x onwards

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/mapper/Mapper.java | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)


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

[tomcat] 01/02: Code clean-up - no functional change

2023-09-26 Thread markt 
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 76b84bc15366c304906f13d6f84e80ecfc82dab7
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:20:57 2023 +0100

Code clean-up - no functional change
---
 java/org/apache/catalina/mapper/Mapper.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/mapper/Mapper.java 
b/java/org/apache/catalina/mapper/Mapper.java
index 0a5690704b..97fe3b9443 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -71,7 +71,7 @@ public final class Mapper {
 /**
  * Mapping from Context object to Context version to support 
RequestDispatcher mappings.
  */
-private final Map 
contextObjectToContextVersionMap = new ConcurrentHashMap<>();
+private final Map contextObjectToContextVersionMap 
= new ConcurrentHashMap<>();
 
 
 // - Public Methods
@@ -272,8 +272,8 @@ public final class Mapper {
 }
 int slashCount = slashCount(path);
 synchronized (mappedHost) {
-ContextVersion newContextVersion = new ContextVersion(version, 
path, slashCount, context, resources,
-welcomeResources);
+ContextVersion newContextVersion =
+new ContextVersion(version, path, slashCount, context, 
resources, welcomeResources);
 if (wrappers != null) {
 addWrappers(newContextVersion, wrappers);
 }
@@ -1433,8 +1433,7 @@ public final class Mapper {
 /**
  * Insert into the right place in a sorted MapElement array, and prevent 
duplicates.
  */
-private static  boolean insertMap(MapElement[] oldMap, 
MapElement[] newMap,
-MapElement newElement) {
+private static  boolean insertMap(MapElement[] oldMap, 
MapElement[] newMap, MapElement newElement) {
 int pos = find(oldMap, newElement.name);
 if ((pos != -1) && (newElement.name.equals(oldMap[pos].name))) {
 return false;


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

[tomcat] 01/02: Code clean-up - no functional change

2023-09-26 Thread markt 
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 57e659c328230fd5faf0e8107eb830e6dc71df66
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:21:16 2023 +0100

Code clean-up - no functional change
---
 java/org/apache/catalina/mapper/Mapper.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/mapper/Mapper.java 
b/java/org/apache/catalina/mapper/Mapper.java
index a1f9d19257..c26875bd23 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -70,7 +70,7 @@ public final class Mapper {
 /**
  * Mapping from Context object to Context version to support 
RequestDispatcher mappings.
  */
-private final Map 
contextObjectToContextVersionMap = new ConcurrentHashMap<>();
+private final Map contextObjectToContextVersionMap 
= new ConcurrentHashMap<>();
 
 
 // - Public Methods
@@ -271,8 +271,8 @@ public final class Mapper {
 }
 int slashCount = slashCount(path);
 synchronized (mappedHost) {
-ContextVersion newContextVersion = new ContextVersion(version, 
path, slashCount, context, resources,
-welcomeResources);
+ContextVersion newContextVersion =
+new ContextVersion(version, path, slashCount, context, 
resources, welcomeResources);
 if (wrappers != null) {
 addWrappers(newContextVersion, wrappers);
 }
@@ -1432,8 +1432,7 @@ public final class Mapper {
 /**
  * Insert into the right place in a sorted MapElement array, and prevent 
duplicates.
  */
-private static  boolean insertMap(MapElement[] oldMap, 
MapElement[] newMap,
-MapElement newElement) {
+private static  boolean insertMap(MapElement[] oldMap, 
MapElement[] newMap, MapElement newElement) {
 int pos = find(oldMap, newElement.name);
 if ((pos != -1) && (newElement.name.equals(oldMap[pos].name))) {
 return false;


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

[tomcat] branch 8.5.x updated (d4b3bf71cf -> d8f44fe1c9)

2023-09-26 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from d4b3bf71cf Fix syncs for mapMembers
 new 57e659c328 Code clean-up - no functional change
 new d8f44fe1c9 Align with 9.0.x onwards

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/catalina/mapper/LocalStrings.properties  |  5 +
 .../catalina/mapper/LocalStrings_fr.properties  |  5 +
 .../catalina/mapper/LocalStrings_ja.properties  |  5 +
 .../catalina/mapper/LocalStrings_ko.properties  |  5 +
 .../catalina/mapper/LocalStrings_zh_CN.properties   |  5 +
 java/org/apache/catalina/mapper/Mapper.java | 21 ++---
 6 files changed, 35 insertions(+), 11 deletions(-)


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

[tomcat] 02/02: Align with 9.0.x onwards

2023-09-26 Thread markt 
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 d8f44fe1c9d67538dee8993a00b783ddc3e979f6
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:31:50 2023 +0100

Align with 9.0.x onwards
---
 java/org/apache/catalina/mapper/LocalStrings.properties  |  5 +
 java/org/apache/catalina/mapper/LocalStrings_fr.properties   |  5 +
 java/org/apache/catalina/mapper/LocalStrings_ja.properties   |  5 +
 java/org/apache/catalina/mapper/LocalStrings_ko.properties   |  5 +
 .../org/apache/catalina/mapper/LocalStrings_zh_CN.properties |  5 +
 java/org/apache/catalina/mapper/Mapper.java  | 12 ++--
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/mapper/LocalStrings.properties 
b/java/org/apache/catalina/mapper/LocalStrings.properties
index 74e5b461bf..b5544fc2fc 100644
--- a/java/org/apache/catalina/mapper/LocalStrings.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings.properties
@@ -13,12 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+mapper.addContext.hostIsAlias=Host [{0}] found is an alias
+mapper.addContext.noHost=No host found [{0}]
 mapper.addHost.sameHost=Duplicate registration of the same host [{0}]. Ignored.
 mapper.addHost.success=Registered host [{0}]
 mapper.addHostAlias.sameHost=Duplicate registration of alias [{0}] for the 
same host [{1}]. Ignored.
 mapper.addHostAlias.success=Registered alias [{0}] for host [{1}]
 mapper.duplicateHost=Duplicate Host [{0}]. The name is already used by Host 
[{1}]. This Host will be ignored.
 mapper.duplicateHostAlias=Duplicate host Alias [{0}] in Host [{1}]. The name 
is already used by Host [{2}]. This Alias will be ignored.
+mapper.findContext.noContext=No context found [{0}]
+mapper.findContext.noContextVersion=No context version found [{0}] [{1}]
+mapper.findContext.noHostOrAlias=No host [{0}] or is an alias
 mapper.removeWrapper=Removing wrapper from Context [{0}] with path [{1}]
 
 mapperListener.pauseContext=Register Context [{0}] as being reloaded for 
service [{1}]
diff --git a/java/org/apache/catalina/mapper/LocalStrings_fr.properties 
b/java/org/apache/catalina/mapper/LocalStrings_fr.properties
index 737a125d28..78d3b40cce 100644
--- a/java/org/apache/catalina/mapper/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings_fr.properties
@@ -13,12 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+mapper.addContext.hostIsAlias=L''hôte [{0}] trouvé est un alias
+mapper.addContext.noHost=Pas d''hôte [{0}]
 mapper.addHost.sameHost=L''enregistrement en double de l''hôte [{0}] est ignoré
 mapper.addHost.success=Enregistré l''hôte [{0}]
 mapper.addHostAlias.sameHost=L''enregistrement en double de l''alias [{0}] de 
l''hôte [{1}] est ignoré
 mapper.addHostAlias.success=L''alias [{0}] pour le hôte [{1}] a été enregistré
 mapper.duplicateHost=L''hôte [{0}] est en double et sera ignoré, le nom est 
déjà utilisé par l''hôte [{1}]
 mapper.duplicateHostAlias=L''alias [{0}] de l''hôte [{1}] est en double et 
sera ignoré, le nom est déjà utilisé par l''hôte [{2}]
+mapper.findContext.noContext=Pas de contexte trouvé [{0}]
+mapper.findContext.noContextVersion=Pas de version du contexte trouvée [{0}] 
[{1}]
+mapper.findContext.noHostOrAlias=Pas d''hôte [{0}] ou c''est un alias
 mapper.removeWrapper=Retire l''enrobeur du contexte [{0}] avec le chemin [{1}]
 
 mapperListener.pauseContext=Enregistrement du contexte [{0}] comme étant en 
cours de rechargement dans le service [{1}]
diff --git a/java/org/apache/catalina/mapper/LocalStrings_ja.properties 
b/java/org/apache/catalina/mapper/LocalStrings_ja.properties
index a7cc764d24..2c4f66c1bc 100644
--- a/java/org/apache/catalina/mapper/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings_ja.properties
@@ -13,12 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+mapper.addContext.hostIsAlias=見つかったHost[{0}]はエイリアスです。
+mapper.addContext.noHost=ホストが見つかりません [{0}]
 mapper.addHost.sameHost=同じホスト [{0}] の登録が重複しています。 無視されます。
 mapper.addHost.success=登録されたホスト [{0}]
 mapper.addHostAlias.sameHost=ホスト [{1}] にエイリアス [{0}] が重複して登録されました。無視します。
 mapper.addHostAlias.success=ホスト [{1}] のエイリアス [{0}] を登録しました。
 mapper.duplicateHost=Host名の重複 [{0}]。この名前はHost[{1}] で使用されているため無視されます。
 mapper.duplicateHostAlias=Host [{1}] のホストエイリアス [{0}] が重複しています。 名前はすでにHost 
[{2}] によって使用されています。 このエイリアスは無視されます。
+mapper.findContext.noContext=コンテキストが見つかりません [{0}]
+mapper.findContext.noContextVersion=コンテキストバージョンが見つかりません[{0}] [{1}]
+mapper.findContext.noHostOrAlias=ホスト [{0}] がないか、エイリアスです
 mapper.removeWrapper=コンテキスト [{0}] からパス [{1}] を使用してラッパーを削除します
 
 mapperListener.pauseContext=コンテキスト [{0}] をサービス [{1}] のために再ロードするものとして登録します

[tomcat] branch main updated: Fix grammar in comment

2023-09-26 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 4b8de62e75 Fix grammar in comment
4b8de62e75 is described below

commit 4b8de62e759d2e95b9e3a6593eab49ec30ff3a85
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:45:13 2023 +0100

Fix grammar in comment
---
 java/org/apache/coyote/http11/Http11Processor.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index c5f193d5ee..5e908b2a1c 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -965,8 +965,7 @@ public class Http11Processor extends AbstractProcessor {
 keepAlive = false;
 }
 
-// This may disabled keep-alive to check before working out the
-// Connection header.
+// This may disable keep-alive so check before working out the 
Connection header
 checkExpectationAndResponseStatus();
 
 // This may disable keep-alive if there is more body to swallow


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

[tomcat] branch 10.1.x updated: Fix grammar in comment

2023-09-26 Thread markt 
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 8f91d402ca Fix grammar in comment
8f91d402ca is described below

commit 8f91d402cac5c20ea4839ce7e9c96d33856adea7
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:45:13 2023 +0100

Fix grammar in comment
---
 java/org/apache/coyote/http11/Http11Processor.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index f274472347..6041e85ba2 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -976,8 +976,7 @@ public class Http11Processor extends AbstractProcessor {
 keepAlive = false;
 }
 
-// This may disabled keep-alive to check before working out the
-// Connection header.
+// This may disable keep-alive so check before working out the 
Connection header
 checkExpectationAndResponseStatus();
 
 // This may disable keep-alive if there is more body to swallow


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

[tomcat] branch 9.0.x updated: Fix grammar in comment

2023-09-26 Thread markt 
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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 977f20c35b Fix grammar in comment
977f20c35b is described below

commit 977f20c35bc33b2e7cdfd430edb1522f80df5cba
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:45:13 2023 +0100

Fix grammar in comment
---
 java/org/apache/coyote/http11/Http11Processor.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index ac531ad105..6b88365dbd 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -975,8 +975,7 @@ public class Http11Processor extends AbstractProcessor {
 keepAlive = false;
 }
 
-// This may disabled keep-alive to check before working out the
-// Connection header.
+// This may disable keep-alive so check before working out the 
Connection header
 checkExpectationAndResponseStatus();
 
 // This may disable keep-alive if there is more body to swallow


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

[tomcat] branch 8.5.x updated: Fix grammar in comment

2023-09-26 Thread markt 
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 2c7858d4f2 Fix grammar in comment
2c7858d4f2 is described below

commit 2c7858d4f2507f6eebd733be7d3e23412fe9a54f
Author: Mark Thomas 
AuthorDate: Tue Sep 26 13:45:13 2023 +0100

Fix grammar in comment
---
 java/org/apache/coyote/http11/Http11Processor.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index ea810616d9..f8d2ffdb86 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1196,8 +1196,7 @@ public class Http11Processor extends AbstractProcessor {
 keepAlive = false;
 }
 
-// This may disabled keep-alive to check before working out the
-// Connection header.
+// This may disable keep-alive so check before working out the 
Connection header
 checkExpectationAndResponseStatus();
 
 // This may disable keep-alive if there is more body to swallow


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

[GitHub] [tomcat-native] michael-o commented on pull request #9: Simplify Address#getInfo() native implementation

2023-09-26 Thread via GitHub 


michael-o commented on PR #9:
URL: https://github.com/apache/tomcat-native/pull/9#issuecomment-1735722146

   @mturk still waiting for years...


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[tomcat] branch 8.5.x updated (2c7858d4f2 -> 00dca673b7)

2023-09-26 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from 2c7858d4f2 Fix grammar in comment
 new 0a218f9716 Code clean-up - no functional change
 new 00dca673b7 Align with 9.0.x onwards

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/catalina/mbeans/BaseCatalinaMBean.java  |   3 +-
 .../org/apache/catalina/mbeans/ClassNameMBean.java |  17 +-
 .../org/apache/catalina/mbeans/ConnectorMBean.java |  53 ++--
 .../org/apache/catalina/mbeans/ContainerMBean.java |  57 ++--
 .../catalina/mbeans/ContextEnvironmentMBean.java   |  26 +-
 java/org/apache/catalina/mbeans/ContextMBean.java  |  50 +--
 .../catalina/mbeans/ContextResourceLinkMBean.java  |  58 ++--
 .../catalina/mbeans/ContextResourceMBean.java  |  69 ++--
 .../mbeans/GlobalResourcesLifecycleListener.java   |  49 ++-
 java/org/apache/catalina/mbeans/GroupMBean.java|  21 +-
 .../apache/catalina/mbeans/LocalStrings.properties |  46 +++
 .../catalina/mbeans/LocalStrings_fr.properties |  46 +++
 .../catalina/mbeans/LocalStrings_ja.properties |  46 +++
 .../catalina/mbeans/LocalStrings_ko.properties |  46 +++
 .../catalina/mbeans/LocalStrings_zh_CN.properties  |  46 +++
 java/org/apache/catalina/mbeans/MBeanDumper.java   |  96 +++---
 java/org/apache/catalina/mbeans/MBeanFactory.java  | 351 +---
 java/org/apache/catalina/mbeans/MBeanUtils.java| 352 +
 .../catalina/mbeans/MemoryUserDatabaseMBean.java   |  60 ++--
 .../catalina/mbeans/NamingResourcesMBean.java  |  80 +++--
 java/org/apache/catalina/mbeans/RoleMBean.java |   5 +-
 java/org/apache/catalina/mbeans/ServiceMBean.java  |  26 +-
 java/org/apache/catalina/mbeans/UserMBean.java |  30 +-
 23 files changed, 888 insertions(+), 745 deletions(-)


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

[tomcat] 01/02: Code clean-up - no functional change

2023-09-26 Thread markt 
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 0a218f971658bdfab307915201d679b51cb8f677
Author: Mark Thomas 
AuthorDate: Tue Sep 26 15:20:34 2023 +0100

Code clean-up - no functional change
---
 .../apache/catalina/mbeans/BaseCatalinaMBean.java  |   3 +-
 .../org/apache/catalina/mbeans/ClassNameMBean.java |  17 +-
 .../org/apache/catalina/mbeans/ConnectorMBean.java |  46 ++-
 .../org/apache/catalina/mbeans/ContainerMBean.java |  57 ++--
 .../catalina/mbeans/ContextEnvironmentMBean.java   |  26 +-
 java/org/apache/catalina/mbeans/ContextMBean.java  |  50 +--
 .../catalina/mbeans/ContextResourceLinkMBean.java  |  47 ++-
 .../catalina/mbeans/ContextResourceMBean.java  |  60 ++--
 .../mbeans/GlobalResourcesLifecycleListener.java   |  31 +-
 java/org/apache/catalina/mbeans/GroupMBean.java|   5 +-
 java/org/apache/catalina/mbeans/MBeanDumper.java   |  89 +++---
 java/org/apache/catalina/mbeans/MBeanFactory.java  | 277 
 java/org/apache/catalina/mbeans/MBeanUtils.java| 349 +
 .../catalina/mbeans/MemoryUserDatabaseMBean.java   |  25 +-
 .../catalina/mbeans/NamingResourcesMBean.java  |  68 ++--
 java/org/apache/catalina/mbeans/RoleMBean.java |   5 +-
 java/org/apache/catalina/mbeans/ServiceMBean.java  |  26 +-
 java/org/apache/catalina/mbeans/UserMBean.java |  11 +-
 18 files changed, 551 insertions(+), 641 deletions(-)

diff --git a/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java 
b/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java
index 7211e7fe3f..35b900cb97 100644
--- a/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java
+++ b/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java
@@ -30,8 +30,7 @@ public abstract class BaseCatalinaMBean extends 
BaseModelMBean {
 @SuppressWarnings("unchecked")
 T resource = (T) getManagedResource();
 return resource;
-} catch (InstanceNotFoundException | RuntimeOperationsException |
-InvalidTargetObjectTypeException e) {
+} catch (InstanceNotFoundException | RuntimeOperationsException | 
InvalidTargetObjectTypeException e) {
 throw new MBeanException(e);
 }
 }
diff --git a/java/org/apache/catalina/mbeans/ClassNameMBean.java 
b/java/org/apache/catalina/mbeans/ClassNameMBean.java
index 4d87b29539..bdf782086a 100644
--- a/java/org/apache/catalina/mbeans/ClassNameMBean.java
+++ b/java/org/apache/catalina/mbeans/ClassNameMBean.java
@@ -17,13 +17,13 @@
 package org.apache.catalina.mbeans;
 
 /**
- * A convenience base class for ModelMBean implementations
- * where the underlying base class (and therefore the set of supported
- * properties) is different for varying implementations of a standard
- * interface.  For Catalina, that includes at least the following:
- * Connector, Logger, Realm, and Valve.  This class creates an artificial
- * MBean attribute named className, which reports the fully
- * qualified class name of the managed object as its value.
+ * 
+ * A convenience base class for ModelMBean implementations 
where the underlying base class (and
+ * therefore the set of supported properties) is different for varying 
implementations of a standard interface. For
+ * Catalina, that includes at least the following: Connector, Logger, Realm, 
and Valve. This class creates an artificial
+ * MBean attribute named className, which reports the fully 
qualified class name of the managed object as
+ * its value.
+ * 
  *
  * @param  The type that this bean represents.
  *
@@ -32,8 +32,7 @@ package org.apache.catalina.mbeans;
 public class ClassNameMBean extends BaseCatalinaMBean {
 
 /**
- * Return the fully qualified Java class name of the managed object
- * for this MBean.
+ * Return the fully qualified Java class name of the managed object for 
this MBean.
  */
 @Override
 public String getClassName() {
diff --git a/java/org/apache/catalina/mbeans/ConnectorMBean.java 
b/java/org/apache/catalina/mbeans/ConnectorMBean.java
index 2e94bf0ada..09f1c23859 100644
--- a/java/org/apache/catalina/mbeans/ConnectorMBean.java
+++ b/java/org/apache/catalina/mbeans/ConnectorMBean.java
@@ -26,8 +26,10 @@ import org.apache.catalina.connector.Connector;
 import org.apache.tomcat.util.IntrospectionUtils;
 
 /**
- * A ModelMBean implementation for the
- * org.apache.coyote.tomcat5.CoyoteConnector component.
+ * 
+ * A ModelMBean implementation for the 
org.apache.coyote.tomcat5.CoyoteConnector
+ * component.
+ * 
  *
  * @author Amy Roh
  */
@@ -38,21 +40,16 @@ public class ConnectorMBean extends 
ClassNameMBean {
  *
  * @param name Name of the requested attribute
  *
- * @exception AttributeNotFoundException if this attribute is not
- *  supported by this MBean
- * @exception MBeanException if the initializer of an object
- *  throws an exception
-

[tomcat] 02/02: Align with 9.0.x onwards

2023-09-26 Thread markt 
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 00dca673b7443f05d9fefd03d832d2009211f81a
Author: Mark Thomas 
AuthorDate: Tue Sep 26 19:03:57 2023 +0100

Align with 9.0.x onwards
---
 .../org/apache/catalina/mbeans/ConnectorMBean.java | 15 ++--
 .../catalina/mbeans/ContextResourceLinkMBean.java  | 17 +++--
 .../catalina/mbeans/ContextResourceMBean.java  | 17 +++--
 .../mbeans/GlobalResourcesLifecycleListener.java   | 26 ---
 java/org/apache/catalina/mbeans/GroupMBean.java| 16 +++--
 .../apache/catalina/mbeans/LocalStrings.properties | 46 
 .../catalina/mbeans/LocalStrings_fr.properties | 46 
 .../catalina/mbeans/LocalStrings_ja.properties | 46 
 .../catalina/mbeans/LocalStrings_ko.properties | 46 
 .../catalina/mbeans/LocalStrings_zh_CN.properties  | 46 
 java/org/apache/catalina/mbeans/MBeanDumper.java   | 21 +++---
 java/org/apache/catalina/mbeans/MBeanFactory.java  | 82 ++
 java/org/apache/catalina/mbeans/MBeanUtils.java| 17 +++--
 .../catalina/mbeans/MemoryUserDatabaseMBean.java   | 35 -
 .../catalina/mbeans/NamingResourcesMBean.java  | 30 +---
 java/org/apache/catalina/mbeans/UserMBean.java | 19 ++---
 16 files changed, 379 insertions(+), 146 deletions(-)

diff --git a/java/org/apache/catalina/mbeans/ConnectorMBean.java 
b/java/org/apache/catalina/mbeans/ConnectorMBean.java
index 09f1c23859..7cd1a45e95 100644
--- a/java/org/apache/catalina/mbeans/ConnectorMBean.java
+++ b/java/org/apache/catalina/mbeans/ConnectorMBean.java
@@ -24,6 +24,7 @@ import javax.management.RuntimeOperationsException;
 
 import org.apache.catalina.connector.Connector;
 import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * 
@@ -35,6 +36,8 @@ import org.apache.tomcat.util.IntrospectionUtils;
  */
 public class ConnectorMBean extends ClassNameMBean {
 
+private static final StringManager sm = 
StringManager.getManager(ConnectorMBean.class);
+
 /**
  * Obtain and return the value of a specific attribute of this MBean.
  *
@@ -49,8 +52,8 @@ public class ConnectorMBean extends ClassNameMBean 
{
 
 // Validate the input parameters
 if (name == null) {
-throw new RuntimeOperationsException(new 
IllegalArgumentException("Attribute name is null"),
-"Attribute name is null");
+throw new RuntimeOperationsException(new 
IllegalArgumentException(sm.getString("mBean.nullName")),
+sm.getString("mBean.nullName"));
 }
 
 Connector connector = doGetManagedResource();
@@ -73,14 +76,14 @@ public class ConnectorMBean extends 
ClassNameMBean {
 
 // Validate the input parameters
 if (attribute == null) {
-throw new RuntimeOperationsException(new 
IllegalArgumentException("Attribute is null"),
-"Attribute is null");
+throw new RuntimeOperationsException(new 
IllegalArgumentException(sm.getString("mBean.nullAttribute")),
+sm.getString("mBean.nullAttribute"));
 }
 String name = attribute.getName();
 Object value = attribute.getValue();
 if (name == null) {
-throw new RuntimeOperationsException(new 
IllegalArgumentException("Attribute name is null"),
-"Attribute name is null");
+throw new RuntimeOperationsException(new 
IllegalArgumentException(sm.getString("mBean.nullName")),
+sm.getString("mBean.nullName"));
 }
 
 Connector connector = doGetManagedResource();
diff --git a/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java 
b/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
index 6f2ca1329e..ae125c95a2 100644
--- a/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
+++ b/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
@@ -24,6 +24,7 @@ import javax.management.RuntimeOperationsException;
 
 import org.apache.tomcat.util.descriptor.web.ContextResourceLink;
 import org.apache.tomcat.util.descriptor.web.NamingResources;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * 
@@ -35,6 +36,8 @@ import org.apache.tomcat.util.descriptor.web.NamingResources;
  */
 public class ContextResourceLinkMBean extends 
BaseCatalinaMBean {
 
+private static final StringManager sm = 
StringManager.getManager(ContextResourceLinkMBean.class);
+
 /**
  * Obtain and return the value of a specific attribute of this MBean.
  *
@@ -49,8 +52,8 @@ public class ContextResourceLinkMBean extends 
BaseCatalinaMBean
@@ -35,6 +36,8 @@ import org.apache.tomcat.util.descriptor.web.NamingResources;
  */
 public class ContextResourceMBean extends BaseCatalinaMBean {
 
+private static final StringManager sm =

[Bug 66676] WebSocket session complains about closed state when calling close()

2023-09-26 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66676

Georg F.  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #10 from Georg F.  ---
Hey Mark,
sorry for the late response.

So we've rewritten the part of how we close the WebSockets a bit.
It seems that this did the trick as there is now less concurrent action on the
WebSocket session and so all the exceptions are gone.

Of course a bit unsatisfying that we don't know what actually caused the issue,
but I had to get rid of the issue, as this was causing additional trouble.

In any case: Thanks for your help and this ticket is now closed.

-- 
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 67518] New: openssl-msvcrt-1.1.1.patch does not cleanly apply to 1.1.1w

2023-09-26 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=67518

Bug ID: 67518
   Summary: openssl-msvcrt-1.1.1.patch does not cleanly apply to
1.1.1w
   Product: Tomcat Native
   Version: 1.2.37
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Library
  Assignee: dev@tomcat.apache.org
  Reporter: micha...@apache.org
  Target Milestone: ---

Output of patch on Windows:
c:\Entwicklung\Projekte\tomcat-native\native\deps\src\openssl>"C:\Program
Files\Git\usr\bin\patch.exe" -p0 <
"C:\Entwicklung\Projekte\tomcat-native\native\srclib\openssl\openssl-msvcrt-1.1.1.patch"
(Stripping trailing CRs from patch; use --binary to disable.)
patching file Configurations/10-main.conf
Hunk #1 succeeded at 1294 (offset 26 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file crypto/engine/eng_openssl.c
Hunk #1 succeeded at 9 with fuzz 1.
(Stripping trailing CRs from patch; use --binary to disable.)
patching file crypto/o_time.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n] n
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file crypto/o_time.c.rej
(Stripping trailing CRs from patch; use --binary to disable.)
patching file engines/e_capi.c
(Stripping trailing CRs from patch; use --binary to disable.)
patching file test/testutil/basic_output.c
(Stripping trailing CRs from patch; use --binary to disable.)
patching file e_os.h
Hunk #1 succeeded at 177 (offset 28 lines).
Hunk #2 succeeded at 185 (offset 28 lines).

I guess the patch needs a little rework

-- 
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 67518] openssl-msvcrt-1.1.1.patch does not cleanly apply to 1.1.1w

2023-09-26 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=67518

Michael Osipov  changed:

   What|Removed |Added

 CC||micha...@apache.org

-- 
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 66670] Add SSLHostConfig#certificateKeyPasswordFile and SSLHostConfig#certificateKeystorePasswordFile

2023-09-26 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66670

Michael Osipov  changed:

   What|Removed |Added

Summary|Add |Add
   |SSLHostConfig#certificateKe |SSLHostConfig#certificateKe
   |yPasswordFile   |yPasswordFile and
   ||SSLHostConfig#certificateKe
   ||ystorePasswordFile

-- 
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