From 1978b027a3702ef71b64443019b255da3a52d796 Mon Sep 17 00:00:00 2001 From: remm Date: Fri, 29 Sep 2006 16:45:17 +0000 Subject: [PATCH] - Add back two reverted patches. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@451345 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/ContextConfig.java | 1 + java/org/apache/jasper/compiler/Generator.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index f9ec1061f..f9145bbd6 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -616,6 +616,7 @@ public class ContextConfig source = new InputSource("file://" + file.getAbsolutePath()); stream = new FileInputStream(file); + context.addWatchedResource(file.getAbsolutePath()); } } catch (Exception e) { log.error(sm.getString("contextConfig.defaultMissing") diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java index bb20079e5..537bd7202 100644 --- a/java/org/apache/jasper/compiler/Generator.java +++ b/java/org/apache/jasper/compiler/Generator.java @@ -3276,7 +3276,7 @@ class Generator { out.printil("out = _jspx_out;"); out.printil("if (out != null && out.getBufferSize() != 0)"); out.pushIndent(); - out.printil("out.clearBuffer();"); + out.printil("try { out.clearBuffer(); } catch (java.io.IOException e) {}"); out.popIndent(); out -- 2.11.0