(tomcat) branch 10.1.x updated: Fix copy/paste error

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new a72713ff15 Fix copy/paste error
a72713ff15 is described below

commit a72713ff15d1350b4e773da1a352c02b92d067ef
Author: Mark Thomas 
AuthorDate: Wed Jun 26 15:25:43 2024 +0100

Fix copy/paste error
---
 test/org/apache/catalina/core/TestAprLifecycleListener.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/core/TestAprLifecycleListener.java 
b/test/org/apache/catalina/core/TestAprLifecycleListener.java
index fa7fd319ba..27653f58be 100644
--- a/test/org/apache/catalina/core/TestAprLifecycleListener.java
+++ b/test/org/apache/catalina/core/TestAprLifecycleListener.java
@@ -71,7 +71,7 @@ public class TestAprLifecycleListener {
 
 Tomcat tomcat2 = new Tomcat();
 Path base2 = Files.createTempDirectory(tmpDir, "tomcat2-");
-tomcat1.setBaseDir(base2.toAbsolutePath().toString());
+tomcat2.setBaseDir(base2.toAbsolutePath().toString());
 tomcat2.setPort(0);
 TesterSupport.initSsl(tomcat2);
 TesterSupport.configureSSLImplementation(tomcat2,


-
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 copy/paste error

2024-02-27 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 73ae83a602 Fix copy/paste error
73ae83a602 is described below

commit 73ae83a602d10257a21134bd5c32a719aa0b49e9
Author: Mark Thomas 
AuthorDate: Tue Feb 27 09:01:15 2024 +

Fix copy/paste error
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8ebde7195b..0d11f722ed 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -108,7 +108,7 @@
   
 
   
-Add support for specifying Java 21 (with the value 21) as
+Add support for specifying Java 22 (with the value 22) as
 the compiler source and/or compiler target for JSP compilation. If used
 with an Eclipse JDT compiler version that does not support these 
values,
 a warning will be logged and the default will used.


-
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 copy/paste error & simplify

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 8b55a6aa6b Fix copy/paste error & simplify
8b55a6aa6b is described below

commit 8b55a6aa6bc4534b6f5ffc28d2a85810247e5509
Author: Mark Thomas 
AuthorDate: Wed Jun 14 09:10:07 2023 +0100

Fix copy/paste error & simplify
---
 java/org/apache/tomcat/util/net/AbstractEndpoint.java | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 3f0862286b..071fa1c954 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -371,18 +371,16 @@ public abstract class AbstractEndpoint {
 
 if (certificate.getStoreType() == StoreType.PEM) {
 // PEM file based
-String keySource = certificate.getCertificateKeystoreFile();
-keySource = certificate.getCertificateKeyFile();
-certificateInfo = sm.getString("endpoint.tls.info.cert.pem", 
keySource, certificate.getCertificateFile(),
-certificate.getCertificateChainFile());
+certificateInfo = sm.getString("endpoint.tls.info.cert.pem", 
certificate.getCertificateKeyFile(),
+certificate.getCertificateFile(), 
certificate.getCertificateChainFile());
 } else {
 // Keystore based
-String keyStore = certificate.getCertificateKeystoreFile();
 String keyAlias = certificate.getCertificateKeyAlias();
 if (keyAlias == null) {
 keyAlias = SSLUtilBase.DEFAULT_KEY_ALIAS;
 }
-certificateInfo = sm.getString("endpoint.tls.info.cert.keystore", 
keyStore, keyAlias);
+certificateInfo =
+sm.getString("endpoint.tls.info.cert.keystore", 
certificate.getCertificateKeystoreFile(), keyAlias);
 }
 
 String trustStoreSource = sslHostConfig.getTruststoreFile();


-
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 copy/paste error

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 13ec5c575d Fix copy/paste error
13ec5c575d is described below

commit 13ec5c575d0db8751ee2bd38d47df67dd6d78b89
Author: Mark Thomas 
AuthorDate: Thu Jan 12 22:23:30 2023 +

Fix copy/paste error
---
 test/org/apache/catalina/tribes/TesterMulticast.java | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/org/apache/catalina/tribes/TesterMulticast.java 
b/test/org/apache/catalina/tribes/TesterMulticast.java
index 3e85687eea..10bb48bbb2 100644
--- a/test/org/apache/catalina/tribes/TesterMulticast.java
+++ b/test/org/apache/catalina/tribes/TesterMulticast.java
@@ -18,8 +18,8 @@ package org.apache.catalina.tribes;
 
 import java.net.DatagramPacket;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
-import java.net.NetworkInterface;
 import java.net.StandardSocketOptions;
 import java.net.UnknownHostException;
 
@@ -83,8 +83,7 @@ public class TesterMulticast {
 public void run() {
 try (MulticastSocket s = new MulticastSocket(PORT)) {
 s.setOption(StandardSocketOptions.IP_MULTICAST_LOOP, 
Boolean.TRUE);
-NetworkInterface networkInterface = 
NetworkInterface.getByInetAddress(INET_ADDRESS);
-s.setNetworkInterface(networkInterface);
+s.joinGroup(new InetSocketAddress(INET_ADDRESS, 0), null);
 DatagramPacket p = new DatagramPacket(new byte[4], 4);
 p.setAddress(INET_ADDRESS);
 p.setPort(PORT);
@@ -111,8 +110,7 @@ public class TesterMulticast {
 public void run() {
 try (MulticastSocket s = new MulticastSocket(PORT)) {
 s.setOption(StandardSocketOptions.IP_MULTICAST_LOOP, 
Boolean.TRUE);
-NetworkInterface networkInterface = 
NetworkInterface.getByInetAddress(INET_ADDRESS);
-s.setNetworkInterface(networkInterface);
+s.joinGroup(new InetSocketAddress(INET_ADDRESS, 0), null);
 DatagramPacket p = new DatagramPacket(new byte[4], 4);
 p.setAddress(INET_ADDRESS);
 p.setPort(PORT);


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