Suppress warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1033042 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/manager/JspHelper.java b/java/org/apache/catalina/manager/JspHelper.java
index ce1064a..194b353 100644 (file)
--- a/java/org/apache/catalina/manager/JspHelper.java
+++ b/java/org/apache/catalina/manager/JspHelper.java
@@ -195,6 +195,7 @@ public class JspHelper {
      *
      * See also OutSupport.writeEscapedXml().
      */
+    @SuppressWarnings("null") // escapedBuffer cannot be null
     public static String escapeXml(String buffer) {
         if (buffer == null) {
             return "";

diff --git a/java/org/apache/jasper/tagplugins/jstl/Util.java b/java/org/apache/jasper/tagplugins/jstl/Util.java
index a593fc6..ca90ed1 100644 (file)
--- a/java/org/apache/jasper/tagplugins/jstl/Util.java
+++ b/java/org/apache/jasper/tagplugins/jstl/Util.java
@@ -178,6 +178,7 @@ public class Util {
      * 
      * taken from org.apache.taglibs.standard.tag.common.core.Util
      */
+    @SuppressWarnings("null") // escapedBuffer cannot be null
     public static String escapeXml(String buffer) {
         int start = 0;
         int length = buffer.length();