Author: violetagg
Date: Fri Dec 5 12:06:23 2014
New Revision: 1643250
URL: http://svn.apache.org/viewvc?rev=1643250&view=rev
Log:
Merged revision 1643249 from tomcat/trunk:
Use the correct constant for the debug message.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 5 12:06:23 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1643250&r1=1643249&r2=1643250&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
Fri Dec 5 12:06:23 2014
@@ -51,7 +51,7 @@ public class JarResource extends Abstrac
return new JarInputStreamWrapper(jarFile, jarEntry, is);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("fileResource.getInputStreamFail",
+ log.debug(sm.getString("jarResource.getInputStreamFail",
getResource().getName(), getBaseUrl()), e);
}
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
