Author: markt
Date: Mon Aug 15 20:24:31 2016
New Revision: 1756423
URL: http://svn.apache.org/viewvc?rev=1756423&view=rev
Log:
Convert a 7.0.x specific log statement
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1756423&r1=1756422&r2=1756423&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Mon
Aug 15 20:24:31 2016
@@ -1086,7 +1086,7 @@ public final class CGIServlet extends Ht
try {
is.close();
} catch (IOException e) {
- log("Could not close is.", e);
+ log.warn(sm.getString("cgiServlet.expandError"),
e);
}
fos.close();
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties?rev=1756423&r1=1756422&r2=1756423&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
Mon Aug 15 20:24:31 2016
@@ -16,6 +16,7 @@
cgiServlet.expandCloseFail=Failed to close input stream for script at path
[{0}]
cgiServlet.expandCreateDirFail=Failed to create destination directory [{0}]
for script expansion
cgiServlet.expandDeleteFail=Failed to delete file at [{0}] after IOException
during expansion
+cgiServlet.expandError=Failed to close input stream
cgiServlet.expandFail=Failed to expand script at path [{0}] to [{1}]
cgiServlet.expandNotFound=Unable to expand [{0}] as it could not be found
cgiServlet.expandOk=Expanded script at path [{0}] to [{1}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
