[tomcat] branch master updated: Fix a couple of minor resource leaks
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d1fdfc0 Fix a couple of minor resource leaks
d1fdfc0 is described below
commit d1fdfc00efb789195cc6653cf88c93b8befcfa1e
Author: Mark Thomas
AuthorDate: Fri Apr 17 10:33:59 2020 +0100
Fix a couple of minor resource leaks
I was experimenting with Eclipse "potential resource leak" warnings and
found these. There are lots more but quite a few look to be false
positives.
---
java/org/apache/catalina/ant/AbstractCatalinaTask.java | 4 +++-
java/org/apache/catalina/ant/DeployTask.java | 15 ---
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 0d30fe2..c1457af 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -319,7 +319,9 @@ public abstract class AbstractCatalinaTask extends
BaseRedirectorHelperTask {
hconn.connect();
// Swallow response message
-IOTools.flow(hconn.getInputStream(), null);
+try (InputStream is = hconn.getInputStream()) {
+IOTools.flow(is, null);
+}
}
diff --git a/java/org/apache/catalina/ant/DeployTask.java
b/java/org/apache/catalina/ant/DeployTask.java
index 777f015..a4c54fc 100644
--- a/java/org/apache/catalina/ant/DeployTask.java
+++ b/java/org/apache/catalina/ant/DeployTask.java
@@ -23,6 +23,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
+import java.nio.channels.FileChannel;
import java.util.regex.Pattern;
import org.apache.tools.ant.BuildException;
@@ -139,19 +140,11 @@ public class DeployTask extends
AbstractCatalinaCommandTask {
throw new BuildException(e);
}
} else {
-FileInputStream fsInput = null;
-try {
-fsInput = new FileInputStream(war);
-contentLength = fsInput.getChannel().size();
+try (FileInputStream fsInput = new FileInputStream(war);
+FileChannel fsChannel = fsInput.getChannel()) {
+contentLength = fsChannel.size();
stream = new BufferedInputStream(fsInput, 1024);
} catch (IOException e) {
-if (fsInput != null) {
-try {
-fsInput.close();
-} catch (IOException ioe) {
-// Ignore
-}
-}
throw new BuildException(e);
}
}
-
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 a couple of minor resource leaks
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 294d9ab Fix a couple of minor resource leaks
294d9ab is described below
commit 294d9ab5911be01ca9541d6b94b3bc762b2c4623
Author: Mark Thomas
AuthorDate: Fri Apr 17 10:33:59 2020 +0100
Fix a couple of minor resource leaks
I was experimenting with Eclipse "potential resource leak" warnings and
found these. There are lots more but quite a few look to be false
positives.
---
java/org/apache/catalina/ant/AbstractCatalinaTask.java | 4 +++-
java/org/apache/catalina/ant/DeployTask.java | 15 ---
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 0d30fe2..c1457af 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -319,7 +319,9 @@ public abstract class AbstractCatalinaTask extends
BaseRedirectorHelperTask {
hconn.connect();
// Swallow response message
-IOTools.flow(hconn.getInputStream(), null);
+try (InputStream is = hconn.getInputStream()) {
+IOTools.flow(is, null);
+}
}
diff --git a/java/org/apache/catalina/ant/DeployTask.java
b/java/org/apache/catalina/ant/DeployTask.java
index 777f015..a4c54fc 100644
--- a/java/org/apache/catalina/ant/DeployTask.java
+++ b/java/org/apache/catalina/ant/DeployTask.java
@@ -23,6 +23,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
+import java.nio.channels.FileChannel;
import java.util.regex.Pattern;
import org.apache.tools.ant.BuildException;
@@ -139,19 +140,11 @@ public class DeployTask extends
AbstractCatalinaCommandTask {
throw new BuildException(e);
}
} else {
-FileInputStream fsInput = null;
-try {
-fsInput = new FileInputStream(war);
-contentLength = fsInput.getChannel().size();
+try (FileInputStream fsInput = new FileInputStream(war);
+FileChannel fsChannel = fsInput.getChannel()) {
+contentLength = fsChannel.size();
stream = new BufferedInputStream(fsInput, 1024);
} catch (IOException e) {
-if (fsInput != null) {
-try {
-fsInput.close();
-} catch (IOException ioe) {
-// Ignore
-}
-}
throw new BuildException(e);
}
}
-
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 a couple of minor resource leaks
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 14df7eb Fix a couple of minor resource leaks
14df7eb is described below
commit 14df7ebf327deb2b9c63d2867666dfe1f80e0179
Author: Mark Thomas
AuthorDate: Fri Apr 17 10:33:59 2020 +0100
Fix a couple of minor resource leaks
I was experimenting with Eclipse "potential resource leak" warnings and
found these. There are lots more but quite a few look to be false
positives.
---
java/org/apache/catalina/ant/AbstractCatalinaTask.java | 4 +++-
java/org/apache/catalina/ant/DeployTask.java | 15 ---
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 0d30fe2..c1457af 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -319,7 +319,9 @@ public abstract class AbstractCatalinaTask extends
BaseRedirectorHelperTask {
hconn.connect();
// Swallow response message
-IOTools.flow(hconn.getInputStream(), null);
+try (InputStream is = hconn.getInputStream()) {
+IOTools.flow(is, null);
+}
}
diff --git a/java/org/apache/catalina/ant/DeployTask.java
b/java/org/apache/catalina/ant/DeployTask.java
index 777f015..a4c54fc 100644
--- a/java/org/apache/catalina/ant/DeployTask.java
+++ b/java/org/apache/catalina/ant/DeployTask.java
@@ -23,6 +23,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
+import java.nio.channels.FileChannel;
import java.util.regex.Pattern;
import org.apache.tools.ant.BuildException;
@@ -139,19 +140,11 @@ public class DeployTask extends
AbstractCatalinaCommandTask {
throw new BuildException(e);
}
} else {
-FileInputStream fsInput = null;
-try {
-fsInput = new FileInputStream(war);
-contentLength = fsInput.getChannel().size();
+try (FileInputStream fsInput = new FileInputStream(war);
+FileChannel fsChannel = fsInput.getChannel()) {
+contentLength = fsChannel.size();
stream = new BufferedInputStream(fsInput, 1024);
} catch (IOException e) {
-if (fsInput != null) {
-try {
-fsInput.close();
-} catch (IOException ioe) {
-// Ignore
-}
-}
throw new BuildException(e);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Proposed Connector API and XML refactoring
Am 2020-04-15 um 23:05 schrieb r...@apache.org: 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 92923fe Proposed Connector API and XML refactoring 92923fe is described below commit 92923febadb5d7901747530272302dc3da6311c2 Author: remm AuthorDate: Wed Apr 15 23:04:47 2020 +0200 Proposed Connector API and XML refactoring See https://cwiki.apache.org/confluence/display/TOMCAT/Connector+API+refactoring To add some fuel to the fire: This looks like a start. I always liked the approach HTTPd took, addd a Listen : + VirtualHost :. Even in the new proposal you have redundancies: scheme, secure, SSLEnabled. Why can't the endpoint or rather a class using this endpoint decide what protocol it speaks when TLS config is nested? What I never understood with Tomcat why Host configs applies to *all* connectors. I cannot freely apply hosts to IP/port combos and selecting on a host level what type of protocol I want to have. My understanding is: * An endpoint impl is a pure socket which can run any protocol * A protocol is uses an endpoint * A Host declares to use a specific endpoint/protocol * Either proto or host declare TLS Which such decoupling one could even introduce AJPS. But a guess this is a lot of work to do. M - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove some SuppressWarnings annotations that are not necessary
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new aefc8c9 Remove some SuppressWarnings annotations that are not
necessary
aefc8c9 is described below
commit aefc8c94008501bfe268460e61a431a341b34a59
Author: Mark Thomas
AuthorDate: Fri Apr 17 10:52:21 2020 +0100
Remove some SuppressWarnings annotations that are not necessary
These annotations create IDE warnings rather than suppress them.
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 --
java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java| 3 ---
java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java | 2 --
java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 1 -
.../org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 --
.../tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java| 1 -
.../apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java| 2 --
java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java | 1 -
11 files changed, 17 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 6345a22..4af74ab 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -106,7 +106,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
}
}
-@SuppressWarnings("resource")
protected static void validateConnectionFactory(final
PoolableConnectionFactory connectionFactory)
throws Exception {
PoolableConnection conn = null;
@@ -1442,7 +1441,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* @throws IllegalStateException if invalidating the connection failed.
* @since 2.1
*/
-@SuppressWarnings("resource")
public void invalidateConnection(final Connection connection) throws
IllegalStateException {
if (connection == null) {
return;
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
index 1a83305..737f171 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
@@ -88,7 +88,6 @@ public class DelegatingConnection
extends AbandonedTrace i
/**
* Returns a string representation of the metadata associated with the
innermost delegate connection.
*/
-@SuppressWarnings("resource")
@Override
public synchronized String toString() {
String str = null;
@@ -139,7 +138,6 @@ public class DelegatingConnection
extends AbandonedTrace i
*connection to compare innermost delegate with
* @return true if innermost delegate equals c
*/
-@SuppressWarnings("resource")
public boolean innermostDelegateEquals(final Connection c) {
final Connection innerCon = getInnermostDelegateInternal();
if (innerCon == null) {
@@ -172,7 +170,6 @@ public class DelegatingConnection
extends AbandonedTrace i
*
* @return innermost delegate.
*/
-@SuppressWarnings("resource")
public final Connection getInnermostDelegateInternal() {
Connection conn = connection;
while (conn != null && conn instanceof DelegatingConnection) {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
index 5dea527..23775c1 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
@@ -686,7 +686,6 @@ public class DelegatingPreparedStatement extends
DelegatingStatement implements
*
* @return String
*/
-@SuppressWarnings("resource")
@Override
public synchronized String toString() {
final Statement statement = getDelegate();
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
index 0f61d1f..ad1021e 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
@@ -605,7 +605,6 @@ public final class DelegatingResultSet extends
AbandonedTrace implements ResultS
*
* @return the innermost delegate.
*/
-@SuppressWarnings("resource")
[tomcat] branch 9.0.x updated: Remove some SuppressWarnings annotations that are not necessary
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 f40d672 Remove some SuppressWarnings annotations that are not
necessary
f40d672 is described below
commit f40d672e0734e18ae1c2c0ca88675696705d1db1
Author: Mark Thomas
AuthorDate: Fri Apr 17 10:52:21 2020 +0100
Remove some SuppressWarnings annotations that are not necessary
These annotations create IDE warnings rather than suppress them.
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 --
java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java| 3 ---
java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java | 2 --
java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 1 -
.../org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 --
.../tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java| 1 -
.../apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java| 2 --
java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java | 1 -
11 files changed, 17 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 6345a22..4af74ab 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -106,7 +106,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
}
}
-@SuppressWarnings("resource")
protected static void validateConnectionFactory(final
PoolableConnectionFactory connectionFactory)
throws Exception {
PoolableConnection conn = null;
@@ -1442,7 +1441,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* @throws IllegalStateException if invalidating the connection failed.
* @since 2.1
*/
-@SuppressWarnings("resource")
public void invalidateConnection(final Connection connection) throws
IllegalStateException {
if (connection == null) {
return;
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
index 1a83305..737f171 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
@@ -88,7 +88,6 @@ public class DelegatingConnection
extends AbandonedTrace i
/**
* Returns a string representation of the metadata associated with the
innermost delegate connection.
*/
-@SuppressWarnings("resource")
@Override
public synchronized String toString() {
String str = null;
@@ -139,7 +138,6 @@ public class DelegatingConnection
extends AbandonedTrace i
*connection to compare innermost delegate with
* @return true if innermost delegate equals c
*/
-@SuppressWarnings("resource")
public boolean innermostDelegateEquals(final Connection c) {
final Connection innerCon = getInnermostDelegateInternal();
if (innerCon == null) {
@@ -172,7 +170,6 @@ public class DelegatingConnection
extends AbandonedTrace i
*
* @return innermost delegate.
*/
-@SuppressWarnings("resource")
public final Connection getInnermostDelegateInternal() {
Connection conn = connection;
while (conn != null && conn instanceof DelegatingConnection) {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
index 5dea527..23775c1 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
@@ -686,7 +686,6 @@ public class DelegatingPreparedStatement extends
DelegatingStatement implements
*
* @return String
*/
-@SuppressWarnings("resource")
@Override
public synchronized String toString() {
final Statement statement = getDelegate();
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
index 0f61d1f..ad1021e 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
@@ -605,7 +605,6 @@ public final class DelegatingResultSet extends
AbandonedTrace implements ResultS
*
* @return the innermost delegate.
*/
-@SuppressWarnings("resource")
buildbot failure in on tomcat-trunk
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/5115 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] d1fdfc00efb789195cc6653cf88c93b8befcfa1e Blamelist: Mark Thomas 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
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5116 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] aefc8c94008501bfe268460e61a431a341b34a59 Blamelist: Mark Thomas Build succeeded! 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-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2259 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 294d9ab5911be01ca9541d6b94b3bc762b2c4623 Blamelist: Mark Thomas 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 8.5.x updated: Remove some SuppressWarnings annotations that are not necessary
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 5d1c58b Remove some SuppressWarnings annotations that are not
necessary
5d1c58b is described below
commit 5d1c58b9c68792d97f5762969772c314ac8c3faa
Author: Mark Thomas
AuthorDate: Fri Apr 17 10:52:21 2020 +0100
Remove some SuppressWarnings annotations that are not necessary
These annotations create IDE warnings rather than suppress them.
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 --
java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java| 3 ---
java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java | 1 -
java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java | 2 --
java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 1 -
.../org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 --
.../tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java| 1 -
.../apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java| 2 --
10 files changed, 16 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 6345a22..4af74ab 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -106,7 +106,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
}
}
-@SuppressWarnings("resource")
protected static void validateConnectionFactory(final
PoolableConnectionFactory connectionFactory)
throws Exception {
PoolableConnection conn = null;
@@ -1442,7 +1441,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* @throws IllegalStateException if invalidating the connection failed.
* @since 2.1
*/
-@SuppressWarnings("resource")
public void invalidateConnection(final Connection connection) throws
IllegalStateException {
if (connection == null) {
return;
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
index 1a83305..737f171 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
@@ -88,7 +88,6 @@ public class DelegatingConnection
extends AbandonedTrace i
/**
* Returns a string representation of the metadata associated with the
innermost delegate connection.
*/
-@SuppressWarnings("resource")
@Override
public synchronized String toString() {
String str = null;
@@ -139,7 +138,6 @@ public class DelegatingConnection
extends AbandonedTrace i
*connection to compare innermost delegate with
* @return true if innermost delegate equals c
*/
-@SuppressWarnings("resource")
public boolean innermostDelegateEquals(final Connection c) {
final Connection innerCon = getInnermostDelegateInternal();
if (innerCon == null) {
@@ -172,7 +170,6 @@ public class DelegatingConnection
extends AbandonedTrace i
*
* @return innermost delegate.
*/
-@SuppressWarnings("resource")
public final Connection getInnermostDelegateInternal() {
Connection conn = connection;
while (conn != null && conn instanceof DelegatingConnection) {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
index 6719ead..a0bcea7 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
@@ -645,7 +645,6 @@ public class DelegatingPreparedStatement extends
DelegatingStatement implements
*
* @return String
*/
-@SuppressWarnings("resource")
@Override
public synchronized String toString() {
final Statement statement = getDelegate();
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
index 1561ede..c5650f5 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
@@ -604,7 +604,6 @@ public final class DelegatingResultSet extends
AbandonedTrace implements ResultS
*
* @return the innermost delegate.
*/
-@SuppressWarnings("resource")
public ResultSet getInnermostDelegate() {
ResultSet r = resultSet
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2260 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 5d1c58b9c68792d97f5762969772c314ac8c3faa Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Proposed Connector API and XML refactoring
On Fri, Apr 17, 2020 at 11:51 AM Michael Osipov wrote: > Am 2020-04-15 um 23:05 schrieb r...@apache.org: > > 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 92923fe Proposed Connector API and XML refactoring > > 92923fe is described below > > > > commit 92923febadb5d7901747530272302dc3da6311c2 > > Author: remm > > AuthorDate: Wed Apr 15 23:04:47 2020 +0200 > > > > Proposed Connector API and XML refactoring > > > > See > https://cwiki.apache.org/confluence/display/TOMCAT/Connector+API+refactoring > > To add some fuel to the fire: This looks like a start. > > I always liked the approach HTTPd took, addd a Listen : + > VirtualHost :. > > Even in the new proposal you have redundancies: scheme, secure, > SSLEnabled. Why can't the endpoint or rather a class using this endpoint > There's actually no duplication with these attributes. SSLEnabled: actually use TLS on the connector secure: Tomcat considers the data received from the client has been kept secure end to end scheme: the protocol scheme to be used on the URL (http or https basically) > decide what protocol it speaks when TLS config is nested? > What I never understood with Tomcat why Host configs applies to *all* > connectors. I cannot freely apply hosts to IP/port combos and selecting > on a host level what type of protocol I want to have. > The refactoring reflects the object structure, because that's how the digester works. There's a slight change to the Connector lifecycle. That's it for this one, the object structure is actually unchanged. I made progress and I think the old XML can be supported. For embedded, old code can be mostly supported too. It would break if trying to manipulate too directly the protocol handler, but normally embedded code uses new Connector(protocol) and sets properties there, so it would work. It would mean keeping the messy code in 10.0, actually adding new code in parallel, but a large cleanup could then occur in 10.1. > > My understanding is: > > * An endpoint impl is a pure socket which can run any protocol > * A protocol is uses an endpoint > * A Host declares to use a specific endpoint/protocol > * Either proto or host declare TLS > Which such decoupling one could even introduce AJPS. > > But a guess this is a lot of work to do. > Indeed that's not what we do. I guess everyone involved with Catalina was skeptical and considered the current nested container structure was flexible enough. Rémy > > M >
Re: [tomcat] branch master updated: Proposed Connector API and XML refactoring
Am 2020-04-17 um 14:02 schrieb Rémy Maucherat: On Fri, Apr 17, 2020 at 11:51 AM Michael Osipov wrote: Am 2020-04-15 um 23:05 schrieb r...@apache.org: 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 92923fe Proposed Connector API and XML refactoring 92923fe is described below commit 92923febadb5d7901747530272302dc3da6311c2 Author: remm AuthorDate: Wed Apr 15 23:04:47 2020 +0200 Proposed Connector API and XML refactoring See https://cwiki.apache.org/confluence/display/TOMCAT/Connector+API+refactoring To add some fuel to the fire: This looks like a start. I always liked the approach HTTPd took, addd a Listen : + VirtualHost :. Even in the new proposal you have redundancies: scheme, secure, SSLEnabled. Why can't the endpoint or rather a class using this endpoint There's actually no duplication with these attributes. SSLEnabled: actually use TLS on the connector Isn't that obvious a soon as I provide sslImplementationName/? secure: Tomcat considers the data received from the client has been kept secure end to end Is that so? How can I guarantee -- as a client -- that a middle box (forwarding proxy) enforces secure comminication? Docs say this: Set this attribute to true if you wish to have calls to request.isSecure() to return true for requests received by this Connector. scheme: the protocol scheme to be used on the URL (http or https basically) This is determined/implied by the protocol handler you use. Saying: and looks just wrong because with ALPN it won't be https, but h2. No TLS is used, you still can try h2c directly if you know upfront. From an admin point of view, this is messy and confusing. Always consider that admins aren't devs. Our admins keeps asking me things about Tomcat config options because they are beyond his understanding as an admin. My understanding is: * An endpoint impl is a pure socket which can run any protocol * A protocol is uses an endpoint * A Host declares to use a specific endpoint/protocol * Either proto or host declare TLS Which such decoupling one could even introduce AJPS. But a guess this is a lot of work to do. Indeed that's not what we do. I guess everyone involved with Catalina was skeptical and considered the current nested container structure was flexible enough. Having said that, I don't think it is flexible enough. It is flexible at places not strictly requiring it while in others limited. M - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64362] New: rewrite valve with http/2 not working
https://bz.apache.org/bugzilla/show_bug.cgi?id=64362
Bug ID: 64362
Summary: rewrite valve with http/2 not working
Product: Tomcat 9
Version: 9.0.16
Hardware: PC
OS: Linux
Status: NEW
Severity: major
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: honza801+apa...@gmail.com
Target Milestone: -
hi,
it seems, that rewrite valve does not work correctly with http/2 enabled.
having this rule:
RewriteRule ^/$ https://%{HTTP_HOST}/uni/ [L,R]
requests end with this:
$ curl -i --http2 https://some.web/
HTTP/2 302
location: https://null/uni/
date: Fri, 17 Apr 2020 12:38:14 GMT
$ curl -i --http1.1 https://some.web/
HTTP/1.1 302
Location: https://some.web/uni/
Transfer-Encoding: chunked
Date: Fri, 17 Apr 2020 12:38:17 GMT
HTTP_HOST has null value, but should be some.web.
please fix it
thanks
jan
--
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 64362] rewrite valve with http/2 not working
https://bz.apache.org/bugzilla/show_bug.cgi?id=64362 Remy Maucherat changed: What|Removed |Added Resolution|--- |WORKSFORME Status|NEW |RESOLVED --- Comment #1 from Remy Maucherat --- This was fixed in 9.0.32. -- 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: Attempt to fix intermittent test failure in CI system
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 9a4173f Attempt to fix intermittent test failure in CI system
9a4173f is described below
commit 9a4173f6c3edd4f95e861fed67fb07cd6337f09c
Author: Mark Thomas
AuthorDate: Fri Apr 17 14:10:01 2020 +0100
Attempt to fix intermittent test failure in CI system
---
.../TestWsWebSocketContainerGetOpenSessions.java | 31 --
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 3ddd00f..0dad184 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -19,10 +19,8 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
import jakarta.servlet.ServletContextEvent;
import jakarta.websocket.ClientEndpointConfig;
import jakarta.websocket.CloseReason;
@@ -355,15 +353,20 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
public static class Tracker {
-private static final Map records = new
ConcurrentHashMap<>();
-private static final AtomicInteger updateCount = new AtomicInteger(0);
+private static final Map records = new HashMap<>();
+private static int updateCount = 0;
-public static void addRecord(String key, int count) {
-records.put(key, Integer.valueOf(count));
-updateCount.incrementAndGet();
+public synchronized static void addRecord(String key, int count) {
+// Need to avoid out of order updates to the Map. If out of order
+// updates occur, keep the one with the highest count.
+Integer oldCount = records.get(key);
+if (oldCount == null || oldCount.intValue() < count) {
+records.put(key, Integer.valueOf(count));
+}
+updateCount++;
}
-public static boolean checkRecord(String key, int expectedCount) {
+public synchronized static boolean checkRecord(String key, int
expectedCount) {
Integer actualCount = records.get(key);
if (actualCount == null) {
if (expectedCount == 0) {
@@ -376,16 +379,16 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
}
}
-public static int getUpdateCount() {
-return updateCount.intValue();
+public synchronized static int getUpdateCount() {
+return updateCount;
}
-public static void reset() {
+public synchronized static void reset() {
records.clear();
-updateCount.set(0);
+updateCount = 0;
}
-public static String dump() {
+public synchronized static String dump() {
return records.toString();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix checkstyle nags
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 19c1bbf Fix checkstyle nags
19c1bbf is described below
commit 19c1bbf9ec9cb602a311dc88413b60a7dc587f11
Author: Mark Thomas
AuthorDate: Fri Apr 17 14:14:23 2020 +0100
Fix checkstyle nags
---
.../websocket/TestWsWebSocketContainerGetOpenSessions.java| 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 0dad184..c6802ba 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -21,6 +21,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
+
import jakarta.servlet.ServletContextEvent;
import jakarta.websocket.ClientEndpointConfig;
import jakarta.websocket.CloseReason;
@@ -356,7 +357,7 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
private static final Map records = new HashMap<>();
private static int updateCount = 0;
-public synchronized static void addRecord(String key, int count) {
+public static synchronized void addRecord(String key, int count) {
// Need to avoid out of order updates to the Map. If out of order
// updates occur, keep the one with the highest count.
Integer oldCount = records.get(key);
@@ -366,7 +367,7 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
updateCount++;
}
-public synchronized static boolean checkRecord(String key, int
expectedCount) {
+public static synchronized boolean checkRecord(String key, int
expectedCount) {
Integer actualCount = records.get(key);
if (actualCount == null) {
if (expectedCount == 0) {
@@ -379,16 +380,16 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
}
}
-public synchronized static int getUpdateCount() {
+public static synchronized int getUpdateCount() {
return updateCount;
}
-public synchronized static void reset() {
+public static synchronized void reset() {
records.clear();
updateCount = 0;
}
-public synchronized static String dump() {
+public static synchronized String dump() {
return records.toString();
}
}
-
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: Attempt to fix intermittent test failure in CI system
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 98e4b4b Attempt to fix intermittent test failure in CI system
98e4b4b is described below
commit 98e4b4bbb30e6ec2ca7ffdebaad0c2acdcf959ee
Author: Mark Thomas
AuthorDate: Fri Apr 17 14:10:01 2020 +0100
Attempt to fix intermittent test failure in CI system
---
.../TestWsWebSocketContainerGetOpenSessions.java | 30 --
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 8190d6c..033ee63 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -19,9 +19,8 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletContextEvent;
import javax.websocket.ClientEndpointConfig;
@@ -355,15 +354,20 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
public static class Tracker {
-private static final Map records = new
ConcurrentHashMap<>();
-private static final AtomicInteger updateCount = new AtomicInteger(0);
+private static final Map records = new HashMap<>();
+private static int updateCount = 0;
-public static void addRecord(String key, int count) {
-records.put(key, Integer.valueOf(count));
-updateCount.incrementAndGet();
+public static synchronized void addRecord(String key, int count) {
+// Need to avoid out of order updates to the Map. If out of order
+// updates occur, keep the one with the highest count.
+Integer oldCount = records.get(key);
+if (oldCount == null || oldCount.intValue() < count) {
+records.put(key, Integer.valueOf(count));
+}
+updateCount++;
}
-public static boolean checkRecord(String key, int expectedCount) {
+public static synchronized boolean checkRecord(String key, int
expectedCount) {
Integer actualCount = records.get(key);
if (actualCount == null) {
if (expectedCount == 0) {
@@ -376,16 +380,16 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
}
}
-public static int getUpdateCount() {
-return updateCount.intValue();
+public static synchronized int getUpdateCount() {
+return updateCount;
}
-public static void reset() {
+public static synchronized void reset() {
records.clear();
-updateCount.set(0);
+updateCount = 0;
}
-public static String dump() {
+public static synchronized String dump() {
return records.toString();
}
}
-
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: Attempt to fix intermittent test failure in CI system
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 bb52ee6 Attempt to fix intermittent test failure in CI system
bb52ee6 is described below
commit bb52ee668dc3efd424017ed0de1c0c0ad49f8015
Author: Mark Thomas
AuthorDate: Fri Apr 17 14:10:01 2020 +0100
Attempt to fix intermittent test failure in CI system
---
.../TestWsWebSocketContainerGetOpenSessions.java | 30 --
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 8190d6c..033ee63 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -19,9 +19,8 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletContextEvent;
import javax.websocket.ClientEndpointConfig;
@@ -355,15 +354,20 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
public static class Tracker {
-private static final Map records = new
ConcurrentHashMap<>();
-private static final AtomicInteger updateCount = new AtomicInteger(0);
+private static final Map records = new HashMap<>();
+private static int updateCount = 0;
-public static void addRecord(String key, int count) {
-records.put(key, Integer.valueOf(count));
-updateCount.incrementAndGet();
+public static synchronized void addRecord(String key, int count) {
+// Need to avoid out of order updates to the Map. If out of order
+// updates occur, keep the one with the highest count.
+Integer oldCount = records.get(key);
+if (oldCount == null || oldCount.intValue() < count) {
+records.put(key, Integer.valueOf(count));
+}
+updateCount++;
}
-public static boolean checkRecord(String key, int expectedCount) {
+public static synchronized boolean checkRecord(String key, int
expectedCount) {
Integer actualCount = records.get(key);
if (actualCount == null) {
if (expectedCount == 0) {
@@ -376,16 +380,16 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
}
}
-public static int getUpdateCount() {
-return updateCount.intValue();
+public static synchronized int getUpdateCount() {
+return updateCount;
}
-public static void reset() {
+public static synchronized void reset() {
records.clear();
-updateCount.set(0);
+updateCount = 0;
}
-public static String dump() {
+public static synchronized String dump() {
return records.toString();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Attempt to fix intermittent test failure in CI system
This is an automated email from the ASF dual-hosted git repository.
markt 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 9aa43a8 Attempt to fix intermittent test failure in CI system
9aa43a8 is described below
commit 9aa43a8e12b39602d51064077cf49039e5a48d0e
Author: Mark Thomas
AuthorDate: Fri Apr 17 14:10:01 2020 +0100
Attempt to fix intermittent test failure in CI system
---
.../TestWsWebSocketContainerGetOpenSessions.java | 30 --
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 68a1698..7811fb3 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -19,9 +19,8 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletContextEvent;
import javax.websocket.ClientEndpointConfig;
@@ -355,15 +354,20 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
public static class Tracker {
-private static final Map records = new
ConcurrentHashMap();
-private static final AtomicInteger updateCount = new AtomicInteger(0);
+private static final Map records = new
HashMap();
+private static int updateCount = 0;
-public static void addRecord(String key, int count) {
-records.put(key, Integer.valueOf(count));
-updateCount.incrementAndGet();
+public static synchronized void addRecord(String key, int count) {
+// Need to avoid out of order updates to the Map. If out of order
+// updates occur, keep the one with the highest count.
+Integer oldCount = records.get(key);
+if (oldCount == null || oldCount.intValue() < count) {
+records.put(key, Integer.valueOf(count));
+}
+updateCount++;
}
-public static boolean checkRecord(String key, int expectedCount) {
+public static synchronized boolean checkRecord(String key, int
expectedCount) {
Integer actualCount = records.get(key);
if (actualCount == null) {
if (expectedCount == 0) {
@@ -376,16 +380,16 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
}
}
-public static int getUpdateCount() {
-return updateCount.intValue();
+public static synchronized int getUpdateCount() {
+return updateCount;
}
-public static void reset() {
+public static synchronized void reset() {
records.clear();
-updateCount.set(0);
+updateCount = 0;
}
-public static String dump() {
+public static synchronized String dump() {
return records.toString();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64355] Web application and Login page Is very slow and Login page to load is taking 5 minitues in Tomcat 9.0.34
https://bz.apache.org/bugzilla/show_bug.cgi?id=64355 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All --- Comment #1 from Mark Thomas --- Bugzilla is not a support forum. There is a range of tools and techniques that can be used to tack down the root cause of a performance issue including thread dumps and profilers. The users mailing list is the place to seek help with this issue. -- 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 64332] encode error on java8
https://bz.apache.org/bugzilla/show_bug.cgi?id=64332 Mark Thomas changed: What|Removed |Added OS||All Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Tomcat hasn't been built correctly. The resource bundles need to be processed by native2ascii before use on Java 8. -- 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: Update JUnit to 4.13
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d739ceb Update JUnit to 4.13
d739ceb is described below
commit d739ceb4dd88f743313aad95e4b4e88b4186f2f3
Author: Mark Thomas
AuthorDate: Fri Apr 17 15:36:18 2020 +0100
Update JUnit to 4.13
---
build.properties.default| 4 ++--
modules/jdbc-pool/build.properties.default | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 2 +-
webapps/docs/changelog.xml | 7 +++
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 2b8bf3b..d73c8c6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -204,10 +204,10 @@
commons-daemon.native.win.loc.1=${base-commons.loc.1}/daemon/binaries/windows/co
commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
# - JUnit Unit Test Suite, version 4.11 or later -
-junit.version=4.12
+junit.version=4.13
junit.checksum.enabled=true
junit.checksum.algorithm=MD5|SHA-1
-junit.checksum.value=5b38c40c97fbd0adee29f91e60405584|2973d150c0dc1fefe998f834810d68f278ea58ec
+junit.checksum.value=5da6445d7b80aba2623e73d4561dcfde|e49ccba652b735c93bd6e6f59760d8254cf597dd
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/modules/jdbc-pool/build.properties.default
b/modules/jdbc-pool/build.properties.default
index 4ae6c3b..c99ae56 100644
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -65,7 +65,7 @@ testdb.validationQuery=SELECT 1
#testdb.validationQuery=VALUES 1
# JUnit Unit Test Suite
-junit.version=4.11
+junit.version=4.13
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 219c4fd..6897798 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 1648953..8e71143 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
test
-output/classes:output/testclasses:${base.path}/junit-4.15/junit-4.15.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
1.7
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2155942..930a1bd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,6 +85,13 @@
+
+
+
+Update JUnit to version 4.13. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 16759] ISAPI_REDIRECTOR Handles %2F improperly
https://bz.apache.org/bugzilla/show_bug.cgi?id=16759 Justin Earle Smith changed: What|Removed |Added CC||smithju1...@protonmail.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 9.0.x updated: Update JUnit to 4.13
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 3084e99 Update JUnit to 4.13
3084e99 is described below
commit 3084e99f05fa5e5e1d150232dd5a0a75fdf25744
Author: Mark Thomas
AuthorDate: Fri Apr 17 15:36:18 2020 +0100
Update JUnit to 4.13
---
build.properties.default| 4 ++--
modules/jdbc-pool/build.properties.default | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 2 +-
webapps/docs/changelog.xml | 7 +++
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 46ce226..4dd772b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -204,10 +204,10 @@
commons-daemon.native.win.loc.1=${base-commons.loc.1}/daemon/binaries/windows/co
commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
# - JUnit Unit Test Suite, version 4.11 or later -
-junit.version=4.12
+junit.version=4.13
junit.checksum.enabled=true
junit.checksum.algorithm=MD5|SHA-1
-junit.checksum.value=5b38c40c97fbd0adee29f91e60405584|2973d150c0dc1fefe998f834810d68f278ea58ec
+junit.checksum.value=5da6445d7b80aba2623e73d4561dcfde|e49ccba652b735c93bd6e6f59760d8254cf597dd
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/modules/jdbc-pool/build.properties.default
b/modules/jdbc-pool/build.properties.default
index 4ae6c3b..c99ae56 100644
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -65,7 +65,7 @@ testdb.validationQuery=SELECT 1
#testdb.validationQuery=VALUES 1
# JUnit Unit Test Suite
-junit.version=4.11
+junit.version=4.13
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 219c4fd..6897798 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 1648953..8e71143 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
test
-output/classes:output/testclasses:${base.path}/junit-4.15/junit-4.15.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
1.7
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cf0d4e8..9f00bf2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,13 @@
+
+
+
+Update JUnit to version 4.13. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Proposed Connector API and XML refactoring
On Fri, Apr 17, 2020 at 2:19 PM Michael Osipov wrote: > Isn't that obvious a soon as I provide > sslImplementationName/? > With the new config SSLHostConfig, SSLEnabled seems to be derivable from that since it's mandatory. This wasn't practical before. However, I see code that also checks the flag in addSslHostConfig. So I am still not comfortable removing it right now. So since there seems to be continued skepticism about the new XML, the best seems to be to do nothing. Rémy
[tomcat] branch master updated: Remove Connector refactoring
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 a9acf2e Remove Connector refactoring a9acf2e is described below commit a9acf2e6bfb2cb014677877831c41e20f58de369 Author: remm AuthorDate: Fri Apr 17 17:00:59 2020 +0200 Remove Connector refactoring The new XML was too verbose. --- TOMCAT-NEXT.txt | 4 1 file changed, 4 deletions(-) diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt index e535179..129a8c7 100644 --- a/TOMCAT-NEXT.txt +++ b/TOMCAT-NEXT.txt @@ -29,10 +29,6 @@ New items for 10.0.x onwards: 1. Remove APR connector. - 2. Connector API and XML refactoring - https://cwiki.apache.org/confluence/display/TOMCAT/Connector+API+refactoring -for details. - Deferred until 10.1.x: 1. Remove the ExtensionValidator and associated classes (assuming that the - 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: Update JUnit to 4.13
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 c6adcb8 Update JUnit to 4.13
c6adcb8 is described below
commit c6adcb884092e3559f2afa525f6e31d691e63fb8
Author: Mark Thomas
AuthorDate: Fri Apr 17 15:36:18 2020 +0100
Update JUnit to 4.13
---
build.properties.default| 4 ++--
modules/jdbc-pool/build.properties.default | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 2 +-
webapps/docs/changelog.xml | 7 +++
6 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 691f2dd..4288056 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -208,10 +208,10 @@
commons-daemon.native.win.loc.1=${base-commons.loc.1}/daemon/binaries/windows/co
commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
# - JUnit Unit Test Suite, version 4.11 or later -
-junit.version=4.12
+junit.version=4.13
junit.checksum.enabled=true
junit.checksum.algorithm=MD5|SHA-1
-junit.checksum.value=5b38c40c97fbd0adee29f91e60405584|2973d150c0dc1fefe998f834810d68f278ea58ec
+junit.checksum.value=5da6445d7b80aba2623e73d4561dcfde|e49ccba652b735c93bd6e6f59760d8254cf597dd
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/modules/jdbc-pool/build.properties.default
b/modules/jdbc-pool/build.properties.default
index d245d5f..4cfa93fa 100644
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -65,7 +65,7 @@ testdb.validationQuery=SELECT 1
#testdb.validationQuery=VALUES 1
# JUnit Unit Test Suite
-junit.version=4.11
+junit.version=4.13
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index fd92233..48aa528 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -30,7 +30,7 @@
-
+
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 9f36332..7e083e6 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 42416d9..609766b 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
test
-output/classes:output/testclasses:${base.path}/junit-4.12/junit-4.12.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
1.7
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d377c99..869bfd7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,6 +72,13 @@
+
+
+
+Update JUnit to version 4.13. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Update JUnit to 4.13
This is an automated email from the ASF dual-hosted git repository.
markt 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 85acbf6 Update JUnit to 4.13
85acbf6 is described below
commit 85acbf61b7605af3784f9a93cfa1b95b8d75828c
Author: Mark Thomas
AuthorDate: Fri Apr 17 15:36:18 2020 +0100
Update JUnit to 4.13
---
build.properties.default | 4 ++--
modules/jdbc-pool/build.properties.default | 2 +-
webapps/docs/changelog.xml | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 65acae2..0ae55fe 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -241,10 +241,10 @@
commons-daemon.native.win.loc.1=${base-commons.loc.1}/daemon/binaries/windows/co
commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
# - JUnit Unit Test Suite, version 4.11 or later -
-junit.version=4.12
+junit.version=4.13
junit.checksum.enabled=true
junit.checksum.algorithm=MD5|SHA-1
-junit.checksum.value=5b38c40c97fbd0adee29f91e60405584|2973d150c0dc1fefe998f834810d68f278ea58ec
+junit.checksum.value=5da6445d7b80aba2623e73d4561dcfde|e49ccba652b735c93bd6e6f59760d8254cf597dd
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/modules/jdbc-pool/build.properties.default
b/modules/jdbc-pool/build.properties.default
index c565dd1..6b83ac7 100644
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -61,7 +61,7 @@ testdb.validationQuery=SELECT 1
#testdb.validationQuery=VALUES 1
# JUnit Unit Test Suite
-junit.version=4.11
+junit.version=4.13
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 27af2ad..fbfae60 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -165,6 +165,9 @@
variable to avoid clashes with other components that use
LOGGING_CONFIG. (markt)
+
+Update JUnit to version 4.13. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64333] build.xml netbeans junit version is out of date
https://bz.apache.org/bugzilla/show_bug.cgi?id=64333 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- Thanks for reporting this. I've been through all current Tomcat versions and updated everything to 4.13. I also fixed what looked like a global find/replace for ECJ that set an invalid JUnit verison. -- 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
[GUMP@gump-vm]: Project tomcat-tc9-test-apr (in module tomcat-tc9) success, but with warnings.
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc9-test-apr contains errors. The current state of this project is 'Success'. Full details are available at: http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -ERROR- No such project [openssl-1-1-1-make-install] for property. -ERROR- Cannot resolve output/outputpath of *unknown* [openssl-1-1-1-make-install] -ERROR- Unhandled Property: test.openssl.path on: Ant on Project:tomcat-tc9-test-apr -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-tc9/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-tc9/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-APR/logs] The following work was performed: http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-apr/gump_work/build_tomcat-tc9_tomcat-tc9-test-apr.html Work Name: build_tomcat-tc9_tomcat-tc9-test-apr (Type: Build) Work ended in a state of : Success Elapsed: 48 mins 34 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-tc9/tomcat-build-libs -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar -Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-tc9/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar -Dtest.openssl.path=*Unset* -Dexecute.test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core -1.3.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dexecute.test.apr=true -Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-1.2-1.1.1/dest-20200415/lib -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-tc9] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-tc9/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/servlet-api.jar:/srv/gump/ public/workspace/tomcat-tc9/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ssi.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-tc9/output/build
[GUMP@gump-vm]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 10 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 10.x, a web server implementing the Jakarta Servlet 5... Full details are available at: http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs] The following work was performed: http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 45 mins 31 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar -Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar -Dtest.temp=output/test-tmp-NIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20200414/bin/openssl -Dexecute.test.ni o=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dexecute.test.apr=false -Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ssi.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-e
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1671 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 85acbf61b7605af3784f9a93cfa1b95b8d75828c Blamelist: Mark Thomas 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
[Bug 64334] Netbeans cannot debug test classes with uninitialised jvmarg
https://bz.apache.org/bugzilla/show_bug.cgi?id=64334 --- Comment #1 from Mark Thomas --- On one level, that JVM argument is there because it was present in the patch you provided for bug 54899 ;) It looks like an attempt to pass that test.jvmarg.egd value from the build.xml file to JVM used for the test run to address potential entropy issues. Things have moved on a bit since the time of bug 54899 and I am assuming that the egd hack is no longer necessary. I'll remove that setting from the sample NetBeans configs. -- 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: Bug 64334. Remove unnecessary JVM arg
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 7b50c35 Bug 64334. Remove unnecessary JVM arg 7b50c35 is described below commit 7b50c35653dbc87b3a72b8592244ef9fa444a301 Author: Mark Thomas AuthorDate: Fri Apr 17 16:32:34 2020 +0100 Bug 64334. Remove unnecessary JVM arg https://bz.apache.org/bugzilla/show_bug.cgi?id=64334 --- res/ide-support/netbeans/nb-tomcat.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/res/ide-support/netbeans/nb-tomcat.xml b/res/ide-support/netbeans/nb-tomcat.xml index d3a73e5..bbcdcd4 100644 --- a/res/ide-support/netbeans/nb-tomcat.xml +++ b/res/ide-support/netbeans/nb-tomcat.xml @@ -123,7 +123,6 @@ - - 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: Bug 64334. Remove unnecessary JVM arg
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 6baac78 Bug 64334. Remove unnecessary JVM arg 6baac78 is described below commit 6baac783453203526354829e71b914a2a18ae6a7 Author: Mark Thomas AuthorDate: Fri Apr 17 16:32:34 2020 +0100 Bug 64334. Remove unnecessary JVM arg https://bz.apache.org/bugzilla/show_bug.cgi?id=64334 --- res/ide-support/netbeans/nb-tomcat.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/res/ide-support/netbeans/nb-tomcat.xml b/res/ide-support/netbeans/nb-tomcat.xml index d3a73e5..bbcdcd4 100644 --- a/res/ide-support/netbeans/nb-tomcat.xml +++ b/res/ide-support/netbeans/nb-tomcat.xml @@ -123,7 +123,6 @@ - - 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: Bug 64334. Remove unnecessary JVM arg
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 fb475cd Bug 64334. Remove unnecessary JVM arg fb475cd is described below commit fb475cdb413f8b10288f19d76df19fae83b11c1d Author: Mark Thomas AuthorDate: Fri Apr 17 16:32:34 2020 +0100 Bug 64334. Remove unnecessary JVM arg https://bz.apache.org/bugzilla/show_bug.cgi?id=64334 --- res/ide-support/netbeans/nb-tomcat.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/res/ide-support/netbeans/nb-tomcat.xml b/res/ide-support/netbeans/nb-tomcat.xml index d3a73e5..bbcdcd4 100644 --- a/res/ide-support/netbeans/nb-tomcat.xml +++ b/res/ide-support/netbeans/nb-tomcat.xml @@ -123,7 +123,6 @@ - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64334] Netbeans cannot debug test classes with uninitialised jvmarg
https://bz.apache.org/bugzilla/show_bug.cgi?id=64334 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Mark Thomas --- Done. -- 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
[GUMP@gump-vm]: Project tomcat-tc9-test-apr (in module tomcat-tc9) success, but with warnings.
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc9-test-apr contains errors. The current state of this project is 'Success'. Full details are available at: http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -ERROR- No such project [openssl-1-1-1-make-install] for property. -ERROR- Cannot resolve output/outputpath of *unknown* [openssl-1-1-1-make-install] -ERROR- Unhandled Property: test.openssl.path on: Ant on Project:tomcat-tc9-test-apr -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-tc9/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-tc9/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-APR/logs] The following work was performed: http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-apr/gump_work/build_tomcat-tc9_tomcat-tc9-test-apr.html Work Name: build_tomcat-tc9_tomcat-tc9-test-apr (Type: Build) Work ended in a state of : Success Elapsed: 48 mins 46 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-tc9/tomcat-build-libs -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar -Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-tc9/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar -Dtest.openssl.path=*Unset* -Dexecute.test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core -1.3.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dexecute.test.apr=true -Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-1.2-1.1.1/dest-20200413/lib -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-tc9] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-tc9/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/servlet-api.jar:/srv/gump/ public/workspace/tomcat-tc9/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ssi.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-tc9/output/build
Re: buildbot failure in on tomcat-7-trunk
On 17/04/2020 16:27, build...@apache.org wrote: > The Buildbot has detected a new failure on builder tomcat-7-trunk while > building tomcat. Full details are available at: > https://ci.apache.org/builders/tomcat-7-trunk/builds/1671 This was a TLS issue downloading JUnit 4.13 I've fixed this directly on the buildslave. Mark > > Buildbot URL: https://ci.apache.org/ > > Buildslave for this Build: asf946_ubuntu > > Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' > triggered this build > Build Source Stamp: [branch 7.0.x] 85acbf61b7605af3784f9a93cfa1b95b8d75828c > Blamelist: Mark Thomas > > 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 > - 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: Remove redundant response message
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 cbe883a Remove redundant response message
cbe883a is described below
commit cbe883a831ef05b929c236d469cbf4e38591cebb
Author: Michael Osipov
AuthorDate: Fri Apr 17 20:58:09 2020 +0200
Remove redundant response message
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 0f5a289..0d89b07 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -702,7 +702,7 @@ public class CoyoteAdapter implements Adapter {
if (request.getContext() == null) {
// Don't overwrite an existing error
if (!response.isError()) {
-response.sendError(404, "Not found");
+response.sendError(404);
}
// Allow processing to continue.
// If present, the error reporting valve will provide a
response
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Remove redundant response message
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 8a79e7e Remove redundant response message
8a79e7e is described below
commit 8a79e7e9ba6da713071a33c959f8d82466ccea97
Author: Michael Osipov
AuthorDate: Fri Apr 17 20:58:09 2020 +0200
Remove redundant response message
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index ccea6a5..c7e7ca4 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -790,7 +790,6 @@ public class CoyoteAdapter implements Adapter {
// so no context could be mapped.
if (request.getContext() == null) {
res.setStatus(404);
-res.setMessage("Not found");
// No context, so use host
Host host = request.getHost();
// Make sure there is a host (might not be during shutdown)
-
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: Remove redundant response message
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 7ed1e2b Remove redundant response message
7ed1e2b is described below
commit 7ed1e2ba74927ddba6857a0607aa3d5d4d7703f4
Author: Michael Osipov
AuthorDate: Fri Apr 17 20:58:09 2020 +0200
Remove redundant response message
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index ec9c4a0..e157eb7 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -699,7 +699,7 @@ public class CoyoteAdapter implements Adapter {
if (request.getContext() == null) {
// Don't overwrite an existing error
if (!response.isError()) {
-response.sendError(404, "Not found");
+response.sendError(404);
}
// Allow processing to continue.
// If present, the error reporting valve will provide a
response
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove redundant response message
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 a9408d8 Remove redundant response message
a9408d8 is described below
commit a9408d818db542cce631a6b980e54a9cc532829e
Author: Michael Osipov
AuthorDate: Fri Apr 17 20:58:09 2020 +0200
Remove redundant response message
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 4a4e32a..d7e55d1 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -694,7 +694,7 @@ public class CoyoteAdapter implements Adapter {
if (request.getContext() == null) {
// Don't overwrite an existing error
if (!response.isError()) {
-response.sendError(404, "Not found");
+response.sendError(404);
}
// Allow processing to continue.
// If present, the error reporting valve will provide a
response
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1672 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 8a79e7e9ba6da713071a33c959f8d82466ccea97 Blamelist: Michael Osipov Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Proposed Connector API and XML refactoring
Am 2020-04-17 um 16:58 schrieb Rémy Maucherat: On Fri, Apr 17, 2020 at 2:19 PM Michael Osipov wrote: Isn't that obvious a soon as I provide sslImplementationName/? With the new config SSLHostConfig, SSLEnabled seems to be derivable from that since it's mandatory. This wasn't practical before. However, I see code that also checks the flag in addSslHostConfig. So I am still not comfortable removing it right now. So since there seems to be continued skepticism about the new XML, the best seems to be to do nothing. I am not really skeptical about it, all I am saying is that redundant stuff should be dropped and the configuration should be straight forward. Your idea goes in the right way. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Question regarding PoEditor
Hello, some time ago Mark announce the ability to use POEditor so users can contribute translations I have started to import Apache OpenMeetings strings to PoEditor to provide our users easier way to contribute But found our strings doesn't fit into Free plan :( Can you share how you were able to get "More Strings"? :)) -- Best regards, Maxim
