From 058c093482040a5b44fa8ecb2c90fb675d095aa3 Mon Sep 17 00:00:00 2001 From: remm Date: Tue, 17 Apr 2007 14:10:07 +0000 Subject: [PATCH] - Protect about possible issues calling toString in escapeXml(Object). git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@529612 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/manager/JspHelper.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/manager/JspHelper.java b/java/org/apache/catalina/manager/JspHelper.java index 39df89ea0..d07ae3523 100644 --- a/java/org/apache/catalina/manager/JspHelper.java +++ b/java/org/apache/catalina/manager/JspHelper.java @@ -180,8 +180,15 @@ public class JspHelper { } public static String escapeXml(Object obj) { - return obj == null ? "" : escapeXml(String.valueOf(obj)); + String value = null; + try { + value = (obj == null) ? null : String.valueOf(obj); + } catch (Exception e) { + // Ignore + } + return escapeXml(value); } + /** * Performs the following substring replacements * (to facilitate output to XML/HTML pages): -- 2.11.0