tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r451345 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/startup/ContextConfig.java jasper/compiler/Generator.java
Date Fri, 29 Sep 2006 16:45:17 GMT
Author: remm
Date: Fri Sep 29 09:45:17 2006
New Revision: 451345

URL: http://svn.apache.org/viewvc?view=rev&rev=451345
Log:
- Add back two reverted patches.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?view=diff&rev=451345&r1=451344&r2=451345
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Sep 29 09:45:17
2006
@@ -616,6 +616,7 @@
                 source =
                     new InputSource("file://" + file.getAbsolutePath());
                 stream = new FileInputStream(file);
+                context.addWatchedResource(file.getAbsolutePath());
             }
         } catch (Exception e) {
             log.error(sm.getString("contextConfig.defaultMissing") 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?view=diff&rev=451345&r1=451344&r2=451345
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Fri Sep 29 09:45:17
2006
@@ -3276,7 +3276,7 @@
         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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message