[tomcat] branch main updated: Remove useless code
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 8cb16cd40b Remove useless code
8cb16cd40b is described below
commit 8cb16cd40bc32bcf4fe693f78edf723a95b2a08b
Author: remm
AuthorDate: Fri Sep 22 09:08:25 2023 +0200
Remove useless code
Found by coverity.
---
java/org/apache/catalina/ha/session/DeltaRequest.java | 5 -
1 file changed, 5 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 7daadae0fe..412d5513a3 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -289,11 +289,6 @@ public class DeltaRequest implements Externalizable {
sessionId = in.readUTF();
recordAllActions = in.readBoolean();
int cnt = in.readInt();
-if (actions == null) {
-actions = new ArrayDeque<>();
-} else {
-actions.clear();
-}
for (int i = 0; i < cnt; i++) {
AttributeInfo info = null;
if (this.actionPool.size() > 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Remove useless code
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 463861bedc Remove useless code
463861bedc is described below
commit 463861bedc1914bb1a1da6ad35347f1ac09b180b
Author: remm
AuthorDate: Fri Sep 22 09:08:25 2023 +0200
Remove useless code
Found by coverity.
---
java/org/apache/catalina/ha/session/DeltaRequest.java | 5 -
1 file changed, 5 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 7daadae0fe..412d5513a3 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -289,11 +289,6 @@ public class DeltaRequest implements Externalizable {
sessionId = in.readUTF();
recordAllActions = in.readBoolean();
int cnt = in.readInt();
-if (actions == null) {
-actions = new ArrayDeque<>();
-} else {
-actions.clear();
-}
for (int i = 0; i < cnt; i++) {
AttributeInfo info = null;
if (this.actionPool.size() > 0) {
-
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 useless code
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0466920ee0 Remove useless code
0466920ee0 is described below
commit 0466920ee018498545e924ceb7d2d0e101f0a6a0
Author: remm
AuthorDate: Fri Sep 22 09:08:25 2023 +0200
Remove useless code
Found by coverity.
---
java/org/apache/catalina/ha/session/DeltaRequest.java | 5 -
1 file changed, 5 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 7daadae0fe..412d5513a3 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -289,11 +289,6 @@ public class DeltaRequest implements Externalizable {
sessionId = in.readUTF();
recordAllActions = in.readBoolean();
int cnt = in.readInt();
-if (actions == null) {
-actions = new ArrayDeque<>();
-} else {
-actions.clear();
-}
for (int i = 0; i < cnt; i++) {
AttributeInfo info = null;
if (this.actionPool.size() > 0) {
-
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 useless code
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new ff53b3b48c Remove useless code
ff53b3b48c is described below
commit ff53b3b48c39a8703ff01db0451fe8bdc78e19a8
Author: remm
AuthorDate: Fri Sep 22 09:08:25 2023 +0200
Remove useless code
Found by coverity.
---
java/org/apache/catalina/ha/session/DeltaRequest.java | 5 -
1 file changed, 5 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 7daadae0fe..412d5513a3 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -289,11 +289,6 @@ public class DeltaRequest implements Externalizable {
sessionId = in.readUTF();
recordAllActions = in.readBoolean();
int cnt = in.readInt();
-if (actions == null) {
-actions = new ArrayDeque<>();
-} else {
-actions.clear();
-}
for (int i = 0; i < cnt; i++) {
AttributeInfo info = null;
if (this.actionPool.size() > 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove useless null checks and add a sync for consistency
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 35fe829275 Remove useless null checks and add a sync for consistency
35fe829275 is described below
commit 35fe829275ba5e806ec3f4f44b2d86f467e1198e
Author: remm
AuthorDate: Fri Sep 22 10:21:13 2023 +0200
Remove useless null checks and add a sync for consistency
Found by coverity.
---
.../catalina/tribes/io/ReplicationStream.java | 2 +-
.../catalina/tribes/membership/MemberImpl.java | 31 +++---
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/tribes/io/ReplicationStream.java
b/java/org/apache/catalina/tribes/io/ReplicationStream.java
index 70265fd826..0cfeb65199 100644
--- a/java/org/apache/catalina/tribes/io/ReplicationStream.java
+++ b/java/org/apache/catalina/tribes/io/ReplicationStream.java
@@ -105,7 +105,7 @@ public final class ReplicationStream extends
ObjectInputStream {
throws IOException, ClassNotFoundException {
ClassLoader latestLoader;
-if (classLoaders != null && classLoaders.length > 0) {
+if (classLoaders.length > 0) {
latestLoader = classLoaders[0];
} else {
latestLoader = null;
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java
b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index 4002686f38..1f95405808 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -394,18 +394,20 @@ public class MemberImpl implements Member,
java.io.Externalizable {
System.arraycopy(data, pos, payload, 0, payload.length);
pos += payload.length;
-member.setHost(addr);
-member.setPort(XByteBuffer.toInt(portd, 0));
-member.setSecurePort(XByteBuffer.toInt(sportd, 0));
-member.setUdpPort(XByteBuffer.toInt(uportd, 0));
-member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
-member.setUniqueId(uniqueId);
-member.payload = payload;
-member.domain = domain;
-member.command = command;
-
-member.dataPkg = new byte[length];
-System.arraycopy(data, offset, member.dataPkg, 0, length);
+synchronized (member) {
+member.setHost(addr);
+member.setPort(XByteBuffer.toInt(portd, 0));
+member.setSecurePort(XByteBuffer.toInt(sportd, 0));
+member.setUdpPort(XByteBuffer.toInt(uportd, 0));
+member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
+member.setUniqueId(uniqueId);
+member.payload = payload;
+member.domain = domain;
+member.command = command;
+
+member.dataPkg = new byte[length];
+System.arraycopy(data, offset, member.dataPkg, 0, length);
+}
return member;
}
@@ -605,10 +607,7 @@ public class MemberImpl implements Member,
java.io.Externalizable {
@Override
public synchronized void setPayload(byte[] payload) {
// longs to avoid any possibility of overflow
-long oldPayloadLength = 0;
-if (this.payload != null) {
-oldPayloadLength = this.payload.length;
-}
+long oldPayloadLength = this.payload.length;
long newPayloadLength = 0;
if (payload != null) {
newPayloadLength = payload.length;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Remove useless null checks and add a sync for consistency
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 815c6a89dd Remove useless null checks and add a sync for consistency
815c6a89dd is described below
commit 815c6a89dd55bdc7e9767b07018f62d7622d0c77
Author: remm
AuthorDate: Fri Sep 22 10:21:13 2023 +0200
Remove useless null checks and add a sync for consistency
Found by coverity.
---
.../catalina/tribes/io/ReplicationStream.java | 2 +-
.../catalina/tribes/membership/MemberImpl.java | 31 +++---
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/tribes/io/ReplicationStream.java
b/java/org/apache/catalina/tribes/io/ReplicationStream.java
index 70265fd826..0cfeb65199 100644
--- a/java/org/apache/catalina/tribes/io/ReplicationStream.java
+++ b/java/org/apache/catalina/tribes/io/ReplicationStream.java
@@ -105,7 +105,7 @@ public final class ReplicationStream extends
ObjectInputStream {
throws IOException, ClassNotFoundException {
ClassLoader latestLoader;
-if (classLoaders != null && classLoaders.length > 0) {
+if (classLoaders.length > 0) {
latestLoader = classLoaders[0];
} else {
latestLoader = null;
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java
b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index 4002686f38..1f95405808 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -394,18 +394,20 @@ public class MemberImpl implements Member,
java.io.Externalizable {
System.arraycopy(data, pos, payload, 0, payload.length);
pos += payload.length;
-member.setHost(addr);
-member.setPort(XByteBuffer.toInt(portd, 0));
-member.setSecurePort(XByteBuffer.toInt(sportd, 0));
-member.setUdpPort(XByteBuffer.toInt(uportd, 0));
-member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
-member.setUniqueId(uniqueId);
-member.payload = payload;
-member.domain = domain;
-member.command = command;
-
-member.dataPkg = new byte[length];
-System.arraycopy(data, offset, member.dataPkg, 0, length);
+synchronized (member) {
+member.setHost(addr);
+member.setPort(XByteBuffer.toInt(portd, 0));
+member.setSecurePort(XByteBuffer.toInt(sportd, 0));
+member.setUdpPort(XByteBuffer.toInt(uportd, 0));
+member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
+member.setUniqueId(uniqueId);
+member.payload = payload;
+member.domain = domain;
+member.command = command;
+
+member.dataPkg = new byte[length];
+System.arraycopy(data, offset, member.dataPkg, 0, length);
+}
return member;
}
@@ -605,10 +607,7 @@ public class MemberImpl implements Member,
java.io.Externalizable {
@Override
public synchronized void setPayload(byte[] payload) {
// longs to avoid any possibility of overflow
-long oldPayloadLength = 0;
-if (this.payload != null) {
-oldPayloadLength = this.payload.length;
-}
+long oldPayloadLength = this.payload.length;
long newPayloadLength = 0;
if (payload != null) {
newPayloadLength = payload.length;
-
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 useless null checks and add a sync for consistency
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new ee319a36d4 Remove useless null checks and add a sync for consistency
ee319a36d4 is described below
commit ee319a36d41811b8cc024ce9bff7dda2dab50aca
Author: remm
AuthorDate: Fri Sep 22 10:21:13 2023 +0200
Remove useless null checks and add a sync for consistency
Found by coverity.
---
.../catalina/tribes/io/ReplicationStream.java | 2 +-
.../catalina/tribes/membership/MemberImpl.java | 31 +++---
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/tribes/io/ReplicationStream.java
b/java/org/apache/catalina/tribes/io/ReplicationStream.java
index bef441fd5a..3d7a38ad95 100644
--- a/java/org/apache/catalina/tribes/io/ReplicationStream.java
+++ b/java/org/apache/catalina/tribes/io/ReplicationStream.java
@@ -105,7 +105,7 @@ public final class ReplicationStream extends
ObjectInputStream {
throws IOException, ClassNotFoundException {
ClassLoader latestLoader;
-if (classLoaders != null && classLoaders.length > 0) {
+if (classLoaders.length > 0) {
latestLoader = classLoaders[0];
} else {
latestLoader = null;
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java
b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index 88cc38e88d..5ba323b1c2 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -403,18 +403,20 @@ public class MemberImpl implements Member,
java.io.Externalizable {
System.arraycopy(data, pos, payload, 0, payload.length);
pos += payload.length;
-member.setHost(addr);
-member.setPort(XByteBuffer.toInt(portd, 0));
-member.setSecurePort(XByteBuffer.toInt(sportd, 0));
-member.setUdpPort(XByteBuffer.toInt(uportd, 0));
-member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
-member.setUniqueId(uniqueId);
-member.payload = payload;
-member.domain = domain;
-member.command = command;
-
-member.dataPkg = new byte[length];
-System.arraycopy(data, offset, member.dataPkg, 0, length);
+synchronized (member) {
+member.setHost(addr);
+member.setPort(XByteBuffer.toInt(portd, 0));
+member.setSecurePort(XByteBuffer.toInt(sportd, 0));
+member.setUdpPort(XByteBuffer.toInt(uportd, 0));
+member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
+member.setUniqueId(uniqueId);
+member.payload = payload;
+member.domain = domain;
+member.command = command;
+
+member.dataPkg = new byte[length];
+System.arraycopy(data, offset, member.dataPkg, 0, length);
+}
return member;
}
@@ -622,10 +624,7 @@ public class MemberImpl implements Member,
java.io.Externalizable {
@Override
public synchronized void setPayload(byte[] payload) {
// longs to avoid any possibility of overflow
-long oldPayloadLength = 0;
-if (this.payload != null) {
-oldPayloadLength = this.payload.length;
-}
+long oldPayloadLength = this.payload.length;
long newPayloadLength = 0;
if (payload != null) {
newPayloadLength = payload.length;
-
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 useless null checks and add a sync for consistency
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 3ec6fb6704 Remove useless null checks and add a sync for consistency
3ec6fb6704 is described below
commit 3ec6fb67045089798de8a373848fb0c6ce2834e5
Author: remm
AuthorDate: Fri Sep 22 10:21:13 2023 +0200
Remove useless null checks and add a sync for consistency
Found by coverity.
---
.../catalina/tribes/io/ReplicationStream.java | 2 +-
.../catalina/tribes/membership/MemberImpl.java | 31 +++---
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/tribes/io/ReplicationStream.java
b/java/org/apache/catalina/tribes/io/ReplicationStream.java
index 9095a36f4b..079bb4ee03 100644
--- a/java/org/apache/catalina/tribes/io/ReplicationStream.java
+++ b/java/org/apache/catalina/tribes/io/ReplicationStream.java
@@ -105,7 +105,7 @@ public final class ReplicationStream extends
ObjectInputStream {
throws IOException, ClassNotFoundException {
ClassLoader latestLoader;
-if (classLoaders != null && classLoaders.length > 0) {
+if (classLoaders.length > 0) {
latestLoader = classLoaders[0];
} else {
latestLoader = null;
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java
b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index e2ae9239da..f4a301d3a7 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -403,18 +403,20 @@ public class MemberImpl implements Member,
java.io.Externalizable {
System.arraycopy(data, pos, payload, 0, payload.length);
pos += payload.length;
-member.setHost(addr);
-member.setPort(XByteBuffer.toInt(portd, 0));
-member.setSecurePort(XByteBuffer.toInt(sportd, 0));
-member.setUdpPort(XByteBuffer.toInt(uportd, 0));
-member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
-member.setUniqueId(uniqueId);
-member.payload = payload;
-member.domain = domain;
-member.command = command;
-
-member.dataPkg = new byte[length];
-System.arraycopy(data, offset, member.dataPkg, 0, length);
+synchronized (member) {
+member.setHost(addr);
+member.setPort(XByteBuffer.toInt(portd, 0));
+member.setSecurePort(XByteBuffer.toInt(sportd, 0));
+member.setUdpPort(XByteBuffer.toInt(uportd, 0));
+member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
+member.setUniqueId(uniqueId);
+member.payload = payload;
+member.domain = domain;
+member.command = command;
+
+member.dataPkg = new byte[length];
+System.arraycopy(data, offset, member.dataPkg, 0, length);
+}
return member;
}
@@ -622,10 +624,7 @@ public class MemberImpl implements Member,
java.io.Externalizable {
@Override
public synchronized void setPayload(byte[] payload) {
// longs to avoid any possibility of overflow
-long oldPayloadLength = 0;
-if (this.payload != null) {
-oldPayloadLength = this.payload.length;
-}
+long oldPayloadLength = this.payload.length;
long newPayloadLength = 0;
if (payload != null) {
newPayloadLength = payload.length;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix inconsistent sync
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 01f954644b Fix inconsistent sync
01f954644b is described below
commit 01f954644bbf34dccafad5039219b2cce4cf4235
Author: remm
AuthorDate: Fri Sep 22 10:50:12 2023 +0200
Fix inconsistent sync
Found by coverity.
---
java/org/apache/catalina/tribes/transport/PooledSender.java | 4 ++--
java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java | 2 +-
java/org/apache/catalina/tribes/transport/RxTaskPool.java | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/tribes/transport/PooledSender.java
b/java/org/apache/catalina/tribes/transport/PooledSender.java
index 89106e9c85..457230c685 100644
--- a/java/org/apache/catalina/tribes/transport/PooledSender.java
+++ b/java/org/apache/catalina/tribes/transport/PooledSender.java
@@ -140,11 +140,11 @@ public abstract class PooledSender extends AbstractSender
implements MultiPointS
this.limit = limit;
}
-public int getInUsePoolSize() {
+public synchronized int getInUsePoolSize() {
return inuse.size();
}
-public int getInPoolSize() {
+public synchronized int getInPoolSize() {
return notinuse.size();
}
diff --git
a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
index a67cc5e71c..7420900805 100644
--- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
+++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
@@ -72,7 +72,7 @@ public class ReplicationTransmitter implements ChannelSender {
* @see org.apache.catalina.tribes.ChannelSender#start()
*/
@Override
-public void start() throws java.io.IOException {
+public synchronized void start() throws java.io.IOException {
getTransport().connect();
// register jmx
JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
diff --git a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
index 5a04e73b9a..619c87f55c 100644
--- a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
+++ b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
@@ -90,7 +90,9 @@ public class RxTaskPool {
}
public int available() {
-return idle.size();
+synchronized (mutex) {
+return idle.size();
+}
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix inconsistent sync
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new ee3642cbc9 Fix inconsistent sync
ee3642cbc9 is described below
commit ee3642cbc92d0e8a791606b5c0d774b1fdbdd373
Author: remm
AuthorDate: Fri Sep 22 10:50:12 2023 +0200
Fix inconsistent sync
Found by coverity.
---
java/org/apache/catalina/tribes/transport/PooledSender.java | 4 ++--
java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java | 2 +-
java/org/apache/catalina/tribes/transport/RxTaskPool.java | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/tribes/transport/PooledSender.java
b/java/org/apache/catalina/tribes/transport/PooledSender.java
index 89106e9c85..457230c685 100644
--- a/java/org/apache/catalina/tribes/transport/PooledSender.java
+++ b/java/org/apache/catalina/tribes/transport/PooledSender.java
@@ -140,11 +140,11 @@ public abstract class PooledSender extends AbstractSender
implements MultiPointS
this.limit = limit;
}
-public int getInUsePoolSize() {
+public synchronized int getInUsePoolSize() {
return inuse.size();
}
-public int getInPoolSize() {
+public synchronized int getInPoolSize() {
return notinuse.size();
}
diff --git
a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
index a67cc5e71c..7420900805 100644
--- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
+++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
@@ -72,7 +72,7 @@ public class ReplicationTransmitter implements ChannelSender {
* @see org.apache.catalina.tribes.ChannelSender#start()
*/
@Override
-public void start() throws java.io.IOException {
+public synchronized void start() throws java.io.IOException {
getTransport().connect();
// register jmx
JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
diff --git a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
index 5a04e73b9a..619c87f55c 100644
--- a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
+++ b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
@@ -90,7 +90,9 @@ public class RxTaskPool {
}
public int available() {
-return idle.size();
+synchronized (mutex) {
+return idle.size();
+}
}
/**
-
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 inconsistent sync
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 13392f0487 Fix inconsistent sync
13392f0487 is described below
commit 13392f0487ba6bcd2819d413570ceb7dc6aaf143
Author: remm
AuthorDate: Fri Sep 22 10:50:12 2023 +0200
Fix inconsistent sync
Found by coverity.
---
java/org/apache/catalina/tribes/transport/PooledSender.java | 4 ++--
java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java | 2 +-
java/org/apache/catalina/tribes/transport/RxTaskPool.java | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/tribes/transport/PooledSender.java
b/java/org/apache/catalina/tribes/transport/PooledSender.java
index 89106e9c85..457230c685 100644
--- a/java/org/apache/catalina/tribes/transport/PooledSender.java
+++ b/java/org/apache/catalina/tribes/transport/PooledSender.java
@@ -140,11 +140,11 @@ public abstract class PooledSender extends AbstractSender
implements MultiPointS
this.limit = limit;
}
-public int getInUsePoolSize() {
+public synchronized int getInUsePoolSize() {
return inuse.size();
}
-public int getInPoolSize() {
+public synchronized int getInPoolSize() {
return notinuse.size();
}
diff --git
a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
index a67cc5e71c..7420900805 100644
--- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
+++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
@@ -72,7 +72,7 @@ public class ReplicationTransmitter implements ChannelSender {
* @see org.apache.catalina.tribes.ChannelSender#start()
*/
@Override
-public void start() throws java.io.IOException {
+public synchronized void start() throws java.io.IOException {
getTransport().connect();
// register jmx
JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
diff --git a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
index 5a04e73b9a..619c87f55c 100644
--- a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
+++ b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
@@ -90,7 +90,9 @@ public class RxTaskPool {
}
public int available() {
-return idle.size();
+synchronized (mutex) {
+return idle.size();
+}
}
/**
-
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 inconsistent sync
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new a73d2c9853 Fix inconsistent sync
a73d2c9853 is described below
commit a73d2c985370b991378d0f276820b80de5475c31
Author: remm
AuthorDate: Fri Sep 22 10:50:12 2023 +0200
Fix inconsistent sync
Found by coverity.
---
java/org/apache/catalina/tribes/transport/PooledSender.java | 4 ++--
java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java | 2 +-
java/org/apache/catalina/tribes/transport/RxTaskPool.java | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/tribes/transport/PooledSender.java
b/java/org/apache/catalina/tribes/transport/PooledSender.java
index 7b5b7c4c0e..19f121a99c 100644
--- a/java/org/apache/catalina/tribes/transport/PooledSender.java
+++ b/java/org/apache/catalina/tribes/transport/PooledSender.java
@@ -140,11 +140,11 @@ public abstract class PooledSender extends AbstractSender
implements MultiPointS
this.limit = limit;
}
-public int getInUsePoolSize() {
+public synchronized int getInUsePoolSize() {
return inuse.size();
}
-public int getInPoolSize() {
+public synchronized int getInPoolSize() {
return notinuse.size();
}
diff --git
a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
index a67cc5e71c..7420900805 100644
--- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
+++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
@@ -72,7 +72,7 @@ public class ReplicationTransmitter implements ChannelSender {
* @see org.apache.catalina.tribes.ChannelSender#start()
*/
@Override
-public void start() throws java.io.IOException {
+public synchronized void start() throws java.io.IOException {
getTransport().connect();
// register jmx
JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
diff --git a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
index 4dc73ee858..6117a6cdfe 100644
--- a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
+++ b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
@@ -90,7 +90,9 @@ public class RxTaskPool {
}
public int available() {
-return idle.size();
+synchronized (mutex) {
+return idle.size();
+}
}
/**
-
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 backport
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 0f017644bc Fix backport
0f017644bc is described below
commit 0f017644bc388015a4488d8ffb73e3af7e0f60bd
Author: Mark Thomas
AuthorDate: Fri Sep 22 13:42:04 2023 +0100
Fix backport
---
test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java | 4
1 file changed, 4 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
index 50254a666b..bfb63bf80b 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
@@ -121,11 +121,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
}
-<<< HEAD
-@Test(expected = javax.websocket.DeploymentException.class)
-===
@Test(expected = DeploymentException.class)
->>> dd9262f4c4 (Remove unnecessary use of FQCN)
public void testConnectToServerEndpointNoHost() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #663: Refactoring the main method of a Tomcat class to improve readability
markt-asf closed pull request #663: Refactoring the main method of a Tomcat class to improve readability URL: https://github.com/apache/tomcat/pull/663 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-10.1.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/962 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] dd9262f4c405d8547375f2440ca58c0465abef12 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Ignore PMD plugin configuration. Order *.zzz entries
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 75dfbeb57d Ignore PMD plugin configuration. Order *.zzz entries 75dfbeb57d is described below commit 75dfbeb57d9e1d0e875e5d21a02870de0658af31 Author: Mark Thomas AuthorDate: Fri Sep 22 15:54:45 2023 +0100 Ignore PMD plugin configuration. Order *.zzz entries --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ec9537f9cb..ba6d197deb 100644 --- a/.gitignore +++ b/.gitignore @@ -29,14 +29,15 @@ mvn.properties .externalToolBuilders .fbprefs .idea +.pmd .project .sdkmanrc .settings .vscode +*.asc *.iml *.ipr *.iws -*.asc *.jj *.tmp maven-resolver-ant-tasks-*.jar - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67472] CorsFilter erroneously adds CORS headers in responses to Non-CORS requests
https://bz.apache.org/bugzilla/show_bug.cgi?id=67472 --- Comment #6 from Christopher Schultz --- It may be possible to tighten this up a bit to help you out. -- 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 main updated: Send fewer CORS-related headers when CORS is not actually being engaged.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e610e31376 Send fewer CORS-related headers when CORS is not actually
being engaged.
e610e31376 is described below
commit e610e313765a9724bbba9ca8ceb6f14af9ae9782
Author: Christopher Schultz
AuthorDate: Fri Sep 22 12:23:00 2023 -0400
Send fewer CORS-related headers when CORS is not actually being engaged.
---
java/org/apache/catalina/filters/CorsFilter.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 6c9d1f3373..33f5d9d59d 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -321,7 +321,11 @@ public class CorsFilter extends GenericFilter {
private void handleNonCORS(final HttpServletRequest request, final
HttpServletResponse response,
final FilterChain filterChain) throws IOException,
ServletException {
-addStandardHeaders(request, response);
+if (!isAnyOriginAllowed()) {
+// If only specific origins are allowed, the response will vary by
+// origin
+ResponseUtil.addVaryFieldName(response,
CorsFilter.REQUEST_HEADER_ORIGIN);
+}
// Let request pass.
filterChain.doFilter(request, response);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Send fewer CORS-related headers when CORS is not actually being engaged.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 46dde2dfa7 Send fewer CORS-related headers when CORS is not actually
being engaged.
46dde2dfa7 is described below
commit 46dde2dfa7cb84b99882c45a11045adab8217fd2
Author: Christopher Schultz
AuthorDate: Fri Sep 22 12:23:00 2023 -0400
Send fewer CORS-related headers when CORS is not actually being engaged.
---
java/org/apache/catalina/filters/CorsFilter.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 6c9d1f3373..33f5d9d59d 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -321,7 +321,11 @@ public class CorsFilter extends GenericFilter {
private void handleNonCORS(final HttpServletRequest request, final
HttpServletResponse response,
final FilterChain filterChain) throws IOException,
ServletException {
-addStandardHeaders(request, response);
+if (!isAnyOriginAllowed()) {
+// If only specific origins are allowed, the response will vary by
+// origin
+ResponseUtil.addVaryFieldName(response,
CorsFilter.REQUEST_HEADER_ORIGIN);
+}
// Let request pass.
filterChain.doFilter(request, response);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add changelog entry
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 28a15a4578 Add changelog entry 28a15a4578 is described below commit 28a15a4578198f87b6ae00ff3f1e8853e9783824 Author: Christopher Schultz AuthorDate: Fri Sep 22 12:42:31 2023 -0400 Add changelog entry --- webapps/docs/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 302d10afc3..edb4fe7e75 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -165,6 +165,9 @@ branch requiring additional Commons IO dependencies, Tomcat has switched to tracking the 1.x branch. (markt) + +67472: Send fewer CORS-related headers when CORS is not +actually being engaged. (schultz) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Add changelog entry
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new dab79f003d Add changelog entry dab79f003d is described below commit dab79f003d04b04322134a506477a6b75879d9eb Author: Christopher Schultz AuthorDate: Fri Sep 22 12:42:31 2023 -0400 Add changelog entry --- webapps/docs/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 476500eab8..4d9044fe65 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -165,6 +165,9 @@ branch requiring additional Commons IO dependencies, Tomcat has switched to tracking the 1.x branch. (markt) + +67472: Send fewer CORS-related headers when CORS is not +actually being engaged. (schultz) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 01118ce2ab Fix typo 01118ce2ab is described below commit 01118ce2ab856deadabd6c99911c136a6d26c29a Author: Christopher Schultz AuthorDate: Fri Sep 22 12:45:11 2023 -0400 Fix typo --- webapps/docs/changelog.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index edb4fe7e75..d37c0e0bb4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -168,6 +168,7 @@ 67472: Send fewer CORS-related headers when CORS is not actually being engaged. (schultz) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 83e4a33446 Fix typo 83e4a33446 is described below commit 83e4a33446613b3bb591534bae0518d44255de89 Author: Christopher Schultz AuthorDate: Fri Sep 22 12:45:11 2023 -0400 Fix typo --- webapps/docs/changelog.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4d9044fe65..42a8145933 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -168,6 +168,7 @@ 67472: Send fewer CORS-related headers when CORS is not actually being engaged. (schultz) + - 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 (0f017644bc -> 330363a443)
This is an automated email from the ASF dual-hosted git repository. schultz pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 0f017644bc Fix backport new 0cde85f721 Add changelog entry new 4dd9c16dd1 Send fewer CORS-related headers when CORS is not actually being engaged. new 330363a443 Fix typo The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/filters/CorsFilter.java | 6 +- webapps/docs/changelog.xml | 4 2 files changed, 9 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 330363a4431f165ae5884cd94b085bd900587614 Author: Christopher Schultz AuthorDate: Fri Sep 22 12:45:11 2023 -0400 Fix typo --- webapps/docs/changelog.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 33670ef298..6f05a1e5ee 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -168,6 +168,7 @@ 67472: Send fewer CORS-related headers when CORS is not actually being engaged. (schultz) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Add changelog entry
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 0cde85f721bdffba10ffbe4decf094b6896816a9 Author: Christopher Schultz AuthorDate: Fri Sep 22 12:42:31 2023 -0400 Add changelog entry --- webapps/docs/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9d71b0be00..33670ef298 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -165,6 +165,9 @@ branch requiring additional Commons IO dependencies, Tomcat has switched to tracking the 1.x branch. (markt) + +67472: Send fewer CORS-related headers when CORS is not +actually being engaged. (schultz) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Send fewer CORS-related headers when CORS is not actually being engaged.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4dd9c16dd1da0eea0a82a9a2f9ba27daf67eda6d
Author: Christopher Schultz
AuthorDate: Fri Sep 22 12:23:00 2023 -0400
Send fewer CORS-related headers when CORS is not actually being engaged.
---
java/org/apache/catalina/filters/CorsFilter.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index dfc728128d..1aec15a43f 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -321,7 +321,11 @@ public class CorsFilter extends GenericFilter {
private void handleNonCORS(final HttpServletRequest request, final
HttpServletResponse response,
final FilterChain filterChain) throws IOException,
ServletException {
-addStandardHeaders(request, response);
+if (!isAnyOriginAllowed()) {
+// If only specific origins are allowed, the response will vary by
+// origin
+ResponseUtil.addVaryFieldName(response,
CorsFilter.REQUEST_HEADER_ORIGIN);
+}
// Let request pass.
filterChain.doFilter(request, response);
-
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: Send fewer CORS-related headers when CORS is not actually being engaged.
This is an automated email from the ASF dual-hosted git repository.
schultz 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 af4ee91831 Send fewer CORS-related headers when CORS is not actually
being engaged.
af4ee91831 is described below
commit af4ee918319c566c43eb8c4e48cdef198ecefc60
Author: Christopher Schultz
AuthorDate: Fri Sep 22 12:23:00 2023 -0400
Send fewer CORS-related headers when CORS is not actually being engaged.
This fixes https://bz.apache.org/bugzilla/show_bug.cgi?id=67472
---
java/org/apache/catalina/filters/CorsFilter.java | 6 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 6c96555e01..5e2414b446 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -323,7 +323,11 @@ public class CorsFilter implements Filter {
private void handleNonCORS(final HttpServletRequest request, final
HttpServletResponse response,
final FilterChain filterChain) throws IOException,
ServletException {
-addStandardHeaders(request, response);
+if (!isAnyOriginAllowed()) {
+// If only specific origins are allowed, the response will vary by
+// origin
+ResponseUtil.addVaryFieldName(response,
CorsFilter.REQUEST_HEADER_ORIGIN);
+}
// Let request pass.
filterChain.doFilter(request, response);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f7e8b2784..836c2f5760 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -165,6 +165,10 @@
branch requiring additional Commons IO dependencies, Tomcat has
switched
to tracking the 1.x branch. (markt)
+
+67472: Send fewer CORS-related headers when CORS is not
+actually being engaged. (schultz)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67472] CorsFilter erroneously adds CORS headers in responses to Non-CORS requests
https://bz.apache.org/bugzilla/show_bug.cgi?id=67472 Christopher Schultz changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #7 from Christopher Schultz --- We've chosen to reduce the header noise on non-CORS requests. Added in 11.x in e610e313765a9724bbba9ca8ceb6f14af9ae9782 Added in 10.x in 46dde2dfa7cb84b99882c45a11045adab8217fd2 Added in 9.0.x in 4dd9c16dd1da0eea0a82a9a2f9ba27daf67eda6d Added in 8.5.x in af4ee918319c566c43eb8c4e48cdef198ecefc60 Hopefully this change will fix your 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
[GitHub] [tomcat] ChristopherSchultz commented on a diff in pull request #670: Adding ASL Bundle-License to the manifests
ChristopherSchultz commented on code in PR #670: URL: https://github.com/apache/tomcat/pull/670#discussion_r1334621098 ## res/bnd/annotations-api.jar.tmp.bnd: ## @@ -15,6 +15,7 @@ -include: build-defaults.bnd, spec-defaults.bnd +Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt Review Comment: Could all of these Bundle-License clauses simply be put into the build-detaults.bnd file or similar? ## res/bnd/annotations-api.jar.tmp.bnd: ## @@ -15,6 +15,7 @@ -include: build-defaults.bnd, spec-defaults.bnd +Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt Review Comment: Could all of these Bundle-License clauses simply be put into the build-defaults.bnd file or similar? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Move to correct section
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 2335c292af Move to correct section 2335c292af is described below commit 2335c292af82d887c3335f781525fa0bc4a80359 Author: Mark Thomas AuthorDate: Fri Sep 22 17:55:28 2023 +0100 Move to correct section --- webapps/docs/changelog.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d37c0e0bb4..63df262a62 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -115,6 +115,10 @@ Fix rewrite rule qsd (query string discard) being ignored if qsa was also use, while it should instead take precedence. (remm) + +67472: Send fewer CORS-related headers when CORS is not +actually being engaged. (schultz) + @@ -165,10 +169,6 @@ branch requiring additional Commons IO dependencies, Tomcat has switched to tracking the 1.x branch. (markt) - -67472: Send fewer CORS-related headers when CORS is not -actually being engaged. (schultz) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Move to correct section
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new d7674d698d Move to correct section d7674d698d is described below commit d7674d698d3d2a76a3145fcf0afd4f326673b650 Author: Mark Thomas AuthorDate: Fri Sep 22 17:55:28 2023 +0100 Move to correct section --- webapps/docs/changelog.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 42a8145933..bf910f0347 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -115,6 +115,10 @@ Fix rewrite rule qsd (query string discard) being ignored if qsa was also use, while it should instead take precedence. (remm) + +67472: Send fewer CORS-related headers when CORS is not +actually being engaged. (schultz) + @@ -165,10 +169,6 @@ branch requiring additional Commons IO dependencies, Tomcat has switched to tracking the 1.x branch. (markt) - -67472: Send fewer CORS-related headers when CORS is not -actually being engaged. (schultz) - - 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: Move to correct section
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 e51dc9d9e5 Move to correct section e51dc9d9e5 is described below commit e51dc9d9e56aec6903b35bf3f9ebd088a61000de Author: Mark Thomas AuthorDate: Fri Sep 22 17:55:28 2023 +0100 Move to correct section --- webapps/docs/changelog.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6f05a1e5ee..8d532c8f13 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -115,6 +115,10 @@ Fix rewrite rule qsd (query string discard) being ignored if qsa was also use, while it should instead take precedence. (remm) + +67472: Send fewer CORS-related headers when CORS is not +actually being engaged. (schultz) + @@ -165,10 +169,6 @@ branch requiring additional Commons IO dependencies, Tomcat has switched to tracking the 1.x branch. (markt) - -67472: Send fewer CORS-related headers when CORS is not -actually being engaged. (schultz) - - 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: Move to correct section
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 0fc7fa2734 Move to correct section 0fc7fa2734 is described below commit 0fc7fa273409d8828617abdac6ba8b045d407c48 Author: Mark Thomas AuthorDate: Fri Sep 22 17:55:28 2023 +0100 Move to correct section --- webapps/docs/changelog.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 836c2f5760..807d08ced4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -115,6 +115,10 @@ Fix rewrite rule qsd (query string discard) being ignored if qsa was also use, while it should instead take precedence. (remm) + +67472: Send fewer CORS-related headers when CORS is not +actually being engaged. (schultz) + @@ -165,10 +169,6 @@ branch requiring additional Commons IO dependencies, Tomcat has switched to tracking the 1.x branch. (markt) - -67472: Send fewer CORS-related headers when CORS is not -actually being engaged. (schultz) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Move to correct section
Mark, On 9/22/23 12:55, ma...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 2335c292af Move to correct section 2335c292af is described below commit 2335c292af82d887c3335f781525fa0bc4a80359 Author: Mark Thomas AuthorDate: Fri Sep 22 17:55:28 2023 +0100 Move to correct section You like the "Catalina" section better for a Filter? -chris --- webapps/docs/changelog.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d37c0e0bb4..63df262a62 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -115,6 +115,10 @@ Fix rewrite rule qsd (query string discard) being ignored if qsa was also use, while it should instead take precedence. (remm) + +67472: Send fewer CORS-related headers when CORS is not +actually being engaged. (schultz) + @@ -165,10 +169,6 @@ branch requiring additional Commons IO dependencies, Tomcat has switched to tracking the 1.x branch. (markt) - -67472: Send fewer CORS-related headers when CORS is not -actually being engaged. (schultz) - - 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 main updated: Add the Bundle-License header for all JARs
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new fb9244ca4c Add the Bundle-License header for all JARs
fb9244ca4c is described below
commit fb9244ca4c9a8bb9fb96561d0c4f5b813489c0ad
Author: Mark Thomas
AuthorDate: Fri Sep 22 17:53:03 2023 +0100
Add the Bundle-License header for all JARs
---
res/bnd/build-defaults.bnd | 1 +
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+)
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index be3f26f36d..b804587bc0 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -14,6 +14,7 @@
# limitations under the License.
Bundle-Version: ${version_cleanup;${version}}
+Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt
Specification-Title: Apache Tomcat
Specification-Version: ${version.major.minor}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 63df262a62..0ab80d029c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -169,6 +169,10 @@
branch requiring additional Commons IO dependencies, Tomcat has
switched
to tracking the 1.x branch. (markt)
+
+Add the Bundle-License header to the JAR manifest for all
+Tomcat JARs. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #670: Adding ASL Bundle-License to the manifests
markt-asf commented on PR #670: URL: https://github.com/apache/tomcat/pull/670#issuecomment-1731755393 Fixed by adding that header to the defaults. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #670: Adding ASL Bundle-License to the manifests
markt-asf closed pull request #670: Adding ASL Bundle-License to the manifests URL: https://github.com/apache/tomcat/pull/670 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Add the Bundle-License header for all JARs
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new f1f3d4a31c Add the Bundle-License header for all JARs
f1f3d4a31c is described below
commit f1f3d4a31ce29b5b68068f0cb9d82d4f7b3ae86b
Author: Mark Thomas
AuthorDate: Fri Sep 22 17:53:03 2023 +0100
Add the Bundle-License header for all JARs
---
res/bnd/build-defaults.bnd | 1 +
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+)
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index be3f26f36d..b804587bc0 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -14,6 +14,7 @@
# limitations under the License.
Bundle-Version: ${version_cleanup;${version}}
+Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt
Specification-Title: Apache Tomcat
Specification-Version: ${version.major.minor}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bf910f0347..d443586e79 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -169,6 +169,10 @@
branch requiring additional Commons IO dependencies, Tomcat has
switched
to tracking the 1.x branch. (markt)
+
+Add the Bundle-License header to the JAR manifest for all
+Tomcat JARs. (markt)
+
-
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: Add the Bundle-License header for all JARs
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 81320ee0d6 Add the Bundle-License header for all JARs
81320ee0d6 is described below
commit 81320ee0d6a0e50ba6c4a0daa154c441c3236126
Author: Mark Thomas
AuthorDate: Fri Sep 22 17:53:03 2023 +0100
Add the Bundle-License header for all JARs
---
res/bnd/build-defaults.bnd | 1 +
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+)
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index be3f26f36d..b804587bc0 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -14,6 +14,7 @@
# limitations under the License.
Bundle-Version: ${version_cleanup;${version}}
+Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt
Specification-Title: Apache Tomcat
Specification-Version: ${version.major.minor}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8d532c8f13..0e6dd3e952 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -169,6 +169,10 @@
branch requiring additional Commons IO dependencies, Tomcat has
switched
to tracking the 1.x branch. (markt)
+
+Add the Bundle-License header to the JAR manifest for all
+Tomcat JARs. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Move to correct section
On 22/09/2023 18:02, Christopher Schultz wrote: Mark, On 9/22/23 12:55, ma...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 2335c292af Move to correct section 2335c292af is described below commit 2335c292af82d887c3335f781525fa0bc4a80359 Author: Mark Thomas AuthorDate: Fri Sep 22 17:55:28 2023 +0100 Move to correct section You like the "Catalina" section better for a Filter? It sits in the org.apache.catalina package which is usually what determines the section it gets listed in. Mark -chris --- webapps/docs/changelog.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d37c0e0bb4..63df262a62 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -115,6 +115,10 @@ Fix rewrite rule qsd (query string discard) being ignored if qsa was also use, while it should instead take precedence. (remm) + + 67472: Send fewer CORS-related headers when CORS is not + actually being engaged. (schultz) + @@ -165,10 +169,6 @@ branch requiring additional Commons IO dependencies, Tomcat has switched to tracking the 1.x branch. (markt) - - 67472: Send fewer CORS-related headers when CORS is not - actually being engaged. (schultz) - - 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67472] CorsFilter erroneously adds CORS headers in responses to Non-CORS requests
https://bz.apache.org/bugzilla/show_bug.cgi?id=67472 --- Comment #8 from lmedini --- Great, it sure will! Thx. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/628 Blamelist: Christopher Schultz Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] 01118ce2ab856deadabd6c99911c136a6d26c29a Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF 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-11.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/629 Blamelist: Christopher Schultz , Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] fb9244ca4c9a8bb9fb96561d0c4f5b813489c0ad Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF 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-10.1.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/963 Blamelist: Christopher Schultz , Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 10.1.x] f1f3d4a31ce29b5b68068f0cb9d82d4f7b3ae86b Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-9.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/701 Blamelist: Christopher Schultz , Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] 81320ee0d6a0e50ba6c4a0daa154c441c3236126 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
