This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 96de8914b19789ad2788b4fc2be6aba3fc69e87b Author: remm <[email protected]> AuthorDate: Wed Oct 7 19:19:57 2026 +0200 Java 8 and javax fixes --- .../apache/catalina/servlets/DataSourcePropertyStore.java | 15 +++++++++------ .../apache/catalina/servlets/TestWebdavPropertyStore.java | 3 +-- test/org/apache/catalina/session/TestStandardManager.java | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/java/org/apache/catalina/servlets/DataSourcePropertyStore.java b/java/org/apache/catalina/servlets/DataSourcePropertyStore.java index 1a7d2390c9..18ec4aa683 100644 --- a/java/org/apache/catalina/servlets/DataSourcePropertyStore.java +++ b/java/org/apache/catalina/servlets/DataSourcePropertyStore.java @@ -22,7 +22,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Objects; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -266,7 +265,7 @@ public class DataSourcePropertyStore implements WebdavServlet.PropertyStore { try (Connection connection = dataSource.getConnection(); PreparedStatement statement = connection.prepareStatement(getPropertyStatement)) { statement.setString(1, resource); - statement.setString(2, Objects.requireNonNullElse(property.getNamespaceURI(), "")); + statement.setString(2, getNamespaceURI(property)); statement.setString(3, property.getLocalName()); if (statement.execute()) { ResultSet rs = statement.getResultSet(); @@ -341,7 +340,7 @@ public class DataSourcePropertyStore implements WebdavServlet.PropertyStore { try { try (PreparedStatement statement = connection.prepareStatement(getPropertyStatement)) { statement.setString(1, resource); - statement.setString(2, Objects.requireNonNullElse(node.getNamespaceURI(), "")); + statement.setString(2, getNamespaceURI(node)); statement.setString(3, node.getLocalName()); if (statement.execute()) { ResultSet rs = statement.getResultSet(); @@ -354,14 +353,14 @@ public class DataSourcePropertyStore implements WebdavServlet.PropertyStore { try (PreparedStatement statement = connection.prepareStatement(setPropertyStatement)) { statement.setString(1, serializedNode); statement.setString(2, resource); - statement.setString(3, Objects.requireNonNullElse(node.getNamespaceURI(), "")); + statement.setString(3, getNamespaceURI(node)); statement.setString(4, node.getLocalName()); statement.execute(); } } else { try (PreparedStatement statement = connection.prepareStatement(addPropertyStatement)) { statement.setString(1, resource); - statement.setString(2, Objects.requireNonNullElse(node.getNamespaceURI(), "")); + statement.setString(2, getNamespaceURI(node)); statement.setString(3, node.getLocalName()); statement.setString(4, serializedNode); statement.execute(); @@ -377,7 +376,7 @@ public class DataSourcePropertyStore implements WebdavServlet.PropertyStore { Node node = operation.getPropertyNode(); try (PreparedStatement statement = connection.prepareStatement(removePropertyStatement)) { statement.setString(1, resource); - statement.setString(2, Objects.requireNonNullElse(node.getNamespaceURI(), "")); + statement.setString(2, getNamespaceURI(node)); statement.setString(3, node.getLocalName()); statement.execute(); } catch (SQLException e) { @@ -408,4 +407,8 @@ public class DataSourcePropertyStore implements WebdavServlet.PropertyStore { } } + private static String getNamespaceURI(Node node) { + String namespaceURI = node.getNamespaceURI(); + return (namespaceURI != null) ? namespaceURI : ""; + } } diff --git a/test/org/apache/catalina/servlets/TestWebdavPropertyStore.java b/test/org/apache/catalina/servlets/TestWebdavPropertyStore.java index 65b79f17c7..cb8eba2a0c 100644 --- a/test/org/apache/catalina/servlets/TestWebdavPropertyStore.java +++ b/test/org/apache/catalina/servlets/TestWebdavPropertyStore.java @@ -29,12 +29,11 @@ import java.util.Collection; import java.util.List; import java.util.logging.Logger; +import javax.servlet.http.HttpServletResponse; import javax.sql.DataSource; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import jakarta.servlet.http.HttpServletResponse; - import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/test/org/apache/catalina/session/TestStandardManager.java b/test/org/apache/catalina/session/TestStandardManager.java index 4f42f526aa..b9238e0c2e 100644 --- a/test/org/apache/catalina/session/TestStandardManager.java +++ b/test/org/apache/catalina/session/TestStandardManager.java @@ -23,9 +23,9 @@ import java.io.Serializable; import java.security.Principal; import java.util.concurrent.atomic.AtomicInteger; -import jakarta.servlet.http.HttpSessionActivationListener; -import jakarta.servlet.http.HttpSessionEvent; -import jakarta.servlet.http.HttpSessionListener; +import javax.servlet.http.HttpSessionActivationListener; +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; import org.junit.Assert; import org.junit.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
