Re: Tomcat 8.5.99 artifacts not in Maven central
Hi Mark Thank you for your rapid action, https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.99/ is now online indeed. Regards S. Ali Tokmen https://ali.tokmen.com/ https://contact.ali.tokmen.com/ On 22/02/2024 21:11, Mark Thomas wrote: On 22/02/2024 20:03, S. Ali Tokmen wrote: Dear Tomcat development team The Tomcat 8.5.99 artifacts not in Maven central. Is this normal? No. I've just checked and they weren't promoted from the staging repository. I've just done that. They should be in Maven Central shortly. 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: Tomcat 8.5.99 artifacts not in Maven central
On 22/02/2024 20:03, S. Ali Tokmen wrote: Dear Tomcat development team The Tomcat 8.5.99 artifacts not in Maven central. Is this normal? No. I've just checked and they weren't promoted from the staging repository. I've just done that. They should be in Maven Central shortly. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tomcat 8.5.99 artifacts not in Maven central
Dear Tomcat development team The Tomcat 8.5.99 artifacts not in Maven central. Is this normal? Regards -- S. Ali Tokmen https://ali.tokmen.com/ https://contact.ali.tokmen.com/ - 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: Avoid counting async dispatches in request count stats
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 a8edff0153 Avoid counting async dispatches in request count stats
a8edff0153 is described below
commit a8edff015315047570ce6d6266829ff2da9c1600
Author: remm
AuthorDate: Thu Feb 22 14:10:06 2024 +0100
Avoid counting async dispatches in request count stats
Fixme cleanup.
Remove fragile instanceof logic.
---
.../apache/catalina/ha/session/DeltaManager.java | 4 ++-
.../apache/catalina/ha/tcp/ReplicationValve.java | 42 +++---
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 2 +-
webapps/docs/changelog.xml | 7
4 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 03a9475b5d..5183025868 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -62,6 +62,8 @@ public class DeltaManager extends ClusterManagerBase {
*/
protected static final StringManager sm =
StringManager.getManager(DeltaManager.class);
+private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
// - Instance Variables
protected String name = null;
@@ -1171,7 +1173,7 @@ public class DeltaManager extends ClusterManagerBase {
@Override
public String[] getInvalidatedSessions() {
-return new String[0];
+return EMPTY_STRING_ARRAY;
}
// message receive
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index a277cb995f..e034cd9385 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -306,12 +306,12 @@ public class ReplicationValve extends ValveBase
implements ClusterValve {
}
Context context = request.getContext();
boolean isCrossContext = context != null && context instanceof
StandardContext && context.getCrossContext();
+boolean isAsync = request.getAsyncContextInternal() != null;
try {
if (isCrossContext) {
if (log.isTraceEnabled()) {
log.trace(sm.getString("ReplicationValve.crossContext.add"));
}
-// FIXME add Pool of Arraylists
crossContextSessions.set(new ArrayList<>());
}
getNext().invoke(request, response);
@@ -324,7 +324,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
return;
}
if (cluster.hasMembers()) {
-sendReplicationMessage(request, totalstart,
isCrossContext, clusterManager);
+sendReplicationMessage(request, totalstart,
isCrossContext, isAsync, clusterManager);
} else {
resetReplicationRequest(request, isCrossContext);
}
@@ -380,7 +380,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
// - Protected
Methods
-protected void sendReplicationMessage(Request request, long totalstart,
boolean isCrossContext,
+protected void sendReplicationMessage(Request request, long totalstart,
boolean isCrossContext, boolean isAsync,
ClusterManager clusterManager) {
// this happens after the request
long start = 0;
@@ -389,10 +389,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
}
try {
// send invalid sessions
-// DeltaManager returns String[0]
-if (!(clusterManager instanceof DeltaManager)) {
-sendInvalidSessions(clusterManager);
-}
+sendInvalidSessions(clusterManager);
// send replication
sendSessionReplicationMessage(request, clusterManager);
if (isCrossContext) {
@@ -403,7 +400,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
log.error(sm.getString("ReplicationValve.send.failure"), x);
} finally {
if (doStatistics()) {
-updateStats(totalstart, start);
+updateStats(totalstart, start, isAsync);
}
}
}
@@ -415,8 +412,8 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
List sessions = crossContextSessions.get();
if (sessions != null && sessions.size() > 0) {
for (DeltaSession
(tomcat) branch 10.1.x updated: Avoid counting async dispatches in request count stats
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 48fb45c018 Avoid counting async dispatches in request count stats
48fb45c018 is described below
commit 48fb45c01809018138bc6c831edab45e915ac8b7
Author: remm
AuthorDate: Thu Feb 22 14:10:06 2024 +0100
Avoid counting async dispatches in request count stats
Fixme cleanup.
Remove fragile instanceof logic.
---
.../apache/catalina/ha/session/DeltaManager.java | 4 ++-
.../apache/catalina/ha/tcp/ReplicationValve.java | 42 +++---
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 2 +-
webapps/docs/changelog.xml | 7
4 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 739107e1f9..2bb7439986 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -62,6 +62,8 @@ public class DeltaManager extends ClusterManagerBase {
*/
protected static final StringManager sm =
StringManager.getManager(DeltaManager.class);
+private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
// - Instance Variables
protected String name = null;
@@ -1052,7 +1054,7 @@ public class DeltaManager extends ClusterManagerBase {
@Override
public String[] getInvalidatedSessions() {
-return new String[0];
+return EMPTY_STRING_ARRAY;
}
// message receive
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index de419319ae..4470d50e89 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -306,12 +306,12 @@ public class ReplicationValve extends ValveBase
implements ClusterValve {
}
Context context = request.getContext();
boolean isCrossContext = context != null && context instanceof
StandardContext && context.getCrossContext();
+boolean isAsync = request.getAsyncContextInternal() != null;
try {
if (isCrossContext) {
if (log.isTraceEnabled()) {
log.trace(sm.getString("ReplicationValve.crossContext.add"));
}
-// FIXME add Pool of Arraylists
crossContextSessions.set(new ArrayList<>());
}
getNext().invoke(request, response);
@@ -324,7 +324,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
return;
}
if (cluster.hasMembers()) {
-sendReplicationMessage(request, totalstart,
isCrossContext, clusterManager);
+sendReplicationMessage(request, totalstart,
isCrossContext, isAsync, clusterManager);
} else {
resetReplicationRequest(request, isCrossContext);
}
@@ -380,7 +380,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
// - Protected
Methods
-protected void sendReplicationMessage(Request request, long totalstart,
boolean isCrossContext,
+protected void sendReplicationMessage(Request request, long totalstart,
boolean isCrossContext, boolean isAsync,
ClusterManager clusterManager) {
// this happens after the request
long start = 0;
@@ -389,10 +389,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
}
try {
// send invalid sessions
-// DeltaManager returns String[0]
-if (!(clusterManager instanceof DeltaManager)) {
-sendInvalidSessions(clusterManager);
-}
+sendInvalidSessions(clusterManager);
// send replication
sendSessionReplicationMessage(request, clusterManager);
if (isCrossContext) {
@@ -403,7 +400,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
log.error(sm.getString("ReplicationValve.send.failure"), x);
} finally {
if (doStatistics()) {
-updateStats(totalstart, start);
+updateStats(totalstart, start, isAsync);
}
}
}
@@ -415,8 +412,8 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
List sessions = crossContextSessions.get();
if (sessions != null && sessions.size() > 0) {
for (DeltaSession
(tomcat) branch main updated: Avoid counting async dispatches in request count stats
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 f63f14419f Avoid counting async dispatches in request count stats
f63f14419f is described below
commit f63f14419f128886f0094243282537f87a551381
Author: remm
AuthorDate: Thu Feb 22 14:10:06 2024 +0100
Avoid counting async dispatches in request count stats
Fixme cleanup.
Remove fragile instanceof logic.
---
.../apache/catalina/ha/session/DeltaManager.java | 4 ++-
.../apache/catalina/ha/tcp/ReplicationValve.java | 42 +++---
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 2 +-
webapps/docs/changelog.xml | 7
4 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 739107e1f9..2bb7439986 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -62,6 +62,8 @@ public class DeltaManager extends ClusterManagerBase {
*/
protected static final StringManager sm =
StringManager.getManager(DeltaManager.class);
+private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
// - Instance Variables
protected String name = null;
@@ -1052,7 +1054,7 @@ public class DeltaManager extends ClusterManagerBase {
@Override
public String[] getInvalidatedSessions() {
-return new String[0];
+return EMPTY_STRING_ARRAY;
}
// message receive
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index de419319ae..4470d50e89 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -306,12 +306,12 @@ public class ReplicationValve extends ValveBase
implements ClusterValve {
}
Context context = request.getContext();
boolean isCrossContext = context != null && context instanceof
StandardContext && context.getCrossContext();
+boolean isAsync = request.getAsyncContextInternal() != null;
try {
if (isCrossContext) {
if (log.isTraceEnabled()) {
log.trace(sm.getString("ReplicationValve.crossContext.add"));
}
-// FIXME add Pool of Arraylists
crossContextSessions.set(new ArrayList<>());
}
getNext().invoke(request, response);
@@ -324,7 +324,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
return;
}
if (cluster.hasMembers()) {
-sendReplicationMessage(request, totalstart,
isCrossContext, clusterManager);
+sendReplicationMessage(request, totalstart,
isCrossContext, isAsync, clusterManager);
} else {
resetReplicationRequest(request, isCrossContext);
}
@@ -380,7 +380,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
// - Protected
Methods
-protected void sendReplicationMessage(Request request, long totalstart,
boolean isCrossContext,
+protected void sendReplicationMessage(Request request, long totalstart,
boolean isCrossContext, boolean isAsync,
ClusterManager clusterManager) {
// this happens after the request
long start = 0;
@@ -389,10 +389,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
}
try {
// send invalid sessions
-// DeltaManager returns String[0]
-if (!(clusterManager instanceof DeltaManager)) {
-sendInvalidSessions(clusterManager);
-}
+sendInvalidSessions(clusterManager);
// send replication
sendSessionReplicationMessage(request, clusterManager);
if (isCrossContext) {
@@ -403,7 +400,7 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
log.error(sm.getString("ReplicationValve.send.failure"), x);
} finally {
if (doStatistics()) {
-updateStats(totalstart, start);
+updateStats(totalstart, start, isAsync);
}
}
}
@@ -415,8 +412,8 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
List sessions = crossContextSessions.get();
if (sessions != null && sessions.size() > 0) {
for (DeltaSession session
(tomcat) branch 10.1.x updated: Update Java version required to build Tomcat
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 559238d7cf Update Java version required to build Tomcat 559238d7cf is described below commit 559238d7cf3a463762e89400425983ea677b472f Author: Mark Thomas AuthorDate: Thu Feb 22 12:48:41 2024 + Update Java version required to build Tomcat --- webapps/docs/tomcat-docs.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl index dcdf8af21e..83d2393730 100644 --- a/webapps/docs/tomcat-docs.xsl +++ b/webapps/docs/tomcat-docs.xsl @@ -38,7 +38,7 @@ - + - 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 comment typo.
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 59b09971b5 Fix comment typo.
59b09971b5 is described below
commit 59b09971b5c6c9109d9784251089e03577e5b7d2
Author: Mark Thomas
AuthorDate: Thu Feb 22 12:46:04 2024 +
Fix comment typo.
---
java/org/apache/catalina/webresources/CachedResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/webresources/CachedResource.java
b/java/org/apache/catalina/webresources/CachedResource.java
index 6bb2f3cb58..f82b368851 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -326,7 +326,7 @@ public class CachedResource implements WebResource {
*
* One option to resolve this issue is to use a custom URL scheme for
resource URLs. This would allow us, via
* registration of a URLStreamHandlerFactory, to control how the
resources are accessed and ensure that all
- * access go via the cache We took this approach for war: URLs so we
can use jar:war:file: URLs to reference
+ * access go via the cache. We took this approach for war: URLs so we
can use jar:war:file: URLs to reference
* resources in unpacked WAR files. However, because
URL.setURLStreamHandlerFactory() may only be called once,
* this can cause problems when using other libraries that also want
to use a custom URL scheme.
*
-
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 comment typo.
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 ca7988244d Fix comment typo.
ca7988244d is described below
commit ca7988244d7896df128f198a126432cee7808bb6
Author: Mark Thomas
AuthorDate: Thu Feb 22 12:46:04 2024 +
Fix comment typo.
---
java/org/apache/catalina/webresources/CachedResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/webresources/CachedResource.java
b/java/org/apache/catalina/webresources/CachedResource.java
index 6bb2f3cb58..f82b368851 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -326,7 +326,7 @@ public class CachedResource implements WebResource {
*
* One option to resolve this issue is to use a custom URL scheme for
resource URLs. This would allow us, via
* registration of a URLStreamHandlerFactory, to control how the
resources are accessed and ensure that all
- * access go via the cache We took this approach for war: URLs so we
can use jar:war:file: URLs to reference
+ * access go via the cache. We took this approach for war: URLs so we
can use jar:war:file: URLs to reference
* resources in unpacked WAR files. However, because
URL.setURLStreamHandlerFactory() may only be called once,
* this can cause problems when using other libraries that also want
to use a custom URL scheme.
*
-
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 comment typo.
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 dfdc90cd61 Fix comment typo.
dfdc90cd61 is described below
commit dfdc90cd615773c4d58940c073847f99cf4ba140
Author: Mark Thomas
AuthorDate: Thu Feb 22 12:46:04 2024 +
Fix comment typo.
---
java/org/apache/catalina/webresources/CachedResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/webresources/CachedResource.java
b/java/org/apache/catalina/webresources/CachedResource.java
index 6bb2f3cb58..f82b368851 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -326,7 +326,7 @@ public class CachedResource implements WebResource {
*
* One option to resolve this issue is to use a custom URL scheme for
resource URLs. This would allow us, via
* registration of a URLStreamHandlerFactory, to control how the
resources are accessed and ensure that all
- * access go via the cache We took this approach for war: URLs so we
can use jar:war:file: URLs to reference
+ * access go via the cache. We took this approach for war: URLs so we
can use jar:war:file: URLs to reference
* resources in unpacked WAR files. However, because
URL.setURLStreamHandlerFactory() may only be called once,
* this can cause problems when using other libraries that also want
to use a custom URL scheme.
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
