Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1CBF917E82 for ; Thu, 26 Mar 2015 21:48:05 +0000 (UTC) Received: (qmail 54318 invoked by uid 500); 26 Mar 2015 21:48:01 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 54240 invoked by uid 500); 26 Mar 2015 21:48:01 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 54230 invoked by uid 99); 26 Mar 2015 21:48:01 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Mar 2015 21:48:01 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 73E17AC01AA for ; Thu, 26 Mar 2015 21:48:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1669451 - /tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Date: Thu, 26 Mar 2015 21:48:01 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150326214801.73E17AC01AA@hades.apache.org> Author: markt Date: Thu Mar 26 21:48:00 2015 New Revision: 1669451 URL: http://svn.apache.org/r1669451 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57752 Exclude non-cached resources from Cache statistics. Patch by Adam Mlodzinski Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1669451&r1=1669450&r2=1669451&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Thu Mar 26 21:48:00 2015 @@ -59,12 +59,12 @@ public class Cache { protected WebResource getResource(String path, boolean useClassLoaderResources) { - lookupCount.incrementAndGet(); - if (noCache(path)) { return root.getResourceInternal(path, useClassLoaderResources); } + lookupCount.incrementAndGet(); + CachedResource cacheEntry = resourceCache.get(path); if (cacheEntry != null && !cacheEntry.validateResource(useClassLoaderResources)) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org