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 705838d34c Align with 9.0.x onwards
705838d34c is described below
commit 705838d34c951dd39face65a152200b8c3958383
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jan 15 08:05:57 2024 +0000
Align with 9.0.x onwards
---
java/org/apache/catalina/session/ManagerBase.java | 11 ++---------
java/org/apache/catalina/session/StoreBase.java | 11 ++---------
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/session/ManagerBase.java
b/java/org/apache/catalina/session/ManagerBase.java
index 514d7603e2..7e048d1862 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -46,6 +46,7 @@ import org.apache.catalina.SessionIdGenerator;
import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.catalina.util.SessionIdGeneratorBase;
import org.apache.catalina.util.StandardSessionIdGenerator;
+import org.apache.catalina.util.ToStringUtil;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -1247,15 +1248,7 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
@Override
public String toString() {
- StringBuilder sb = new StringBuilder(this.getClass().getName());
- sb.append('[');
- if (context == null) {
- sb.append("Context is null");
- } else {
- sb.append(context.getName());
- }
- sb.append(']');
- return sb.toString();
+ return ToStringUtil.toString(this, context);
}
diff --git a/java/org/apache/catalina/session/StoreBase.java
b/java/org/apache/catalina/session/StoreBase.java
index 4b76462634..222864a6d6 100644
--- a/java/org/apache/catalina/session/StoreBase.java
+++ b/java/org/apache/catalina/session/StoreBase.java
@@ -29,6 +29,7 @@ import org.apache.catalina.Manager;
import org.apache.catalina.Store;
import org.apache.catalina.util.CustomObjectInputStream;
import org.apache.catalina.util.LifecycleBase;
+import org.apache.catalina.util.ToStringUtil;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -270,14 +271,6 @@ public abstract class StoreBase extends LifecycleBase
implements Store {
*/
@Override
public String toString() {
- StringBuilder sb = new StringBuilder(this.getClass().getName());
- sb.append('[');
- if (manager == null) {
- sb.append("Manager is null");
- } else {
- sb.append(manager);
- }
- sb.append(']');
- return sb.toString();
+ return ToStringUtil.toString(this, manager);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
