Author: violetagg Date: Wed Dec 3 08:40:13 2014 New Revision: 1643069 URL: http://svn.apache.org/r1643069 Log: Merged revision 1643066 from tomcat/trunk: Use the correct class when creating a logger.
Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java Propchange: tomcat/tc8.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 3 08:40:13 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 +/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,1643066 Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1643069&r1=1643068&r2=1643069&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java Wed Dec 3 08:40:13 2014 @@ -33,7 +33,7 @@ import org.apache.juli.logging.LogFactor */ public class JarWarResource extends AbstractArchiveResource { - private static final Log log = LogFactory.getLog(JarResource.class); + private static final Log log = LogFactory.getLog(JarWarResource.class); private final String archivePath; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org