You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/05/31 09:08:58 UTC
[tomcat] branch 10.1.x updated: Align with 9.0.x / 8.5.x
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 d09d0a2548 Align with 9.0.x / 8.5.x
d09d0a2548 is described below
commit d09d0a2548fcf51571ccbba82c9f762de4a41364
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 31 10:08:50 2023 +0100
Align with 9.0.x / 8.5.x
---
java/org/apache/catalina/session/DataSourceStore.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/session/DataSourceStore.java b/java/org/apache/catalina/session/DataSourceStore.java
index 7dd4d91166..cbce1d3a3e 100644
--- a/java/org/apache/catalina/session/DataSourceStore.java
+++ b/java/org/apache/catalina/session/DataSourceStore.java
@@ -665,7 +665,7 @@ public class DataSourceStore extends StoreBase {
if (dataSourceName != null && dataSource == null) {
org.apache.catalina.Context context = getManager().getContext();
ClassLoader oldThreadContextCL = null;
- if (localDataSource) {
+ if (getLocalDataSource()) {
oldThreadContextCL = context.bind(Globals.IS_SECURITY_ENABLED, null);
}
@@ -677,7 +677,7 @@ public class DataSourceStore extends StoreBase {
} catch (NamingException e) {
context.getLogger().error(sm.getString(getStoreName() + ".wrongDataSource", this.dataSourceName), e);
} finally {
- if (localDataSource) {
+ if (getLocalDataSource()) {
context.unbind(Globals.IS_SECURITY_ENABLED, oldThreadContextCL);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org