From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 17 Apr 2007 14:10:07 +0000 (+0000)
Subject: - Protect about possible issues calling toString in escapeXml(Object).
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=058c093482040a5b44fa8ecb2c90fb675d095aa3;p=tomcat7.0

- 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
---

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):