From e68c2d1f54c37b71128f05b488dfb326660cc60a Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 1 Jan 2008 20:04:45 +0000 Subject: [PATCH] Fix bug 43758. Return empty string rather than null to prevent the NPEs that happen otherwise. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@607903 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/Node.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/java/org/apache/jasper/compiler/Node.java b/java/org/apache/jasper/compiler/Node.java index fc05627f3..f4a8d8f87 100644 --- a/java/org/apache/jasper/compiler/Node.java +++ b/java/org/apache/jasper/compiler/Node.java @@ -831,12 +831,17 @@ abstract class Node implements TagConstants { */ public String getText() { String ret = text; - if ((ret == null) && (body != null)) { - StringBuffer buf = new StringBuffer(); - for (int i = 0; i < body.size(); i++) { - buf.append(body.getNode(i).getText()); + if (ret == null) { + if (body != null) { + StringBuffer buf = new StringBuffer(); + for (int i = 0; i < body.size(); i++) { + buf.append(body.getNode(i).getText()); + } + ret = buf.toString(); + } else { + // Nulls cause NPEs further down the line + ret = ""; } - ret = buf.toString(); } return ret; } -- 2.11.0