From ee7441d5faa5814bd64b993b2290bef96a86cb3d Mon Sep 17 00:00:00 2001 From: jfclere Date: Thu, 6 May 2010 13:44:15 +0000 Subject: [PATCH] make sure the entropy can be converted to a String. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@941722 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/session/ManagerBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java index 0ebe9812b..f3df1619f 100644 --- a/java/org/apache/catalina/session/ManagerBase.java +++ b/java/org/apache/catalina/session/ManagerBase.java @@ -47,6 +47,7 @@ import org.apache.catalina.Manager; import org.apache.catalina.Session; import org.apache.catalina.mbeans.MBeanUtils; import org.apache.catalina.util.LifecycleMBeanBase; +import org.apache.catalina.util.Base64; import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.res.StringManager; import org.apache.juli.logging.Log; @@ -399,7 +400,7 @@ public abstract class ManagerBase extends LifecycleMBeanBase ExceptionUtils.handleThrowable(t); } if (apr) { - setEntropy(new String(result)); + setEntropy(new String(Base64.encode(result))); } else { setEntropy(this.toString()); } -- 2.11.0