Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A042C82CF for ; Sun, 14 Aug 2011 18:08:15 +0000 (UTC) Received: (qmail 62088 invoked by uid 500); 14 Aug 2011 18:08:15 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 62015 invoked by uid 500); 14 Aug 2011 18:08:14 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 62008 invoked by uid 99); 14 Aug 2011 18:08:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Aug 2011 18:08:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Aug 2011 18:08:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 609722388A33 for ; Sun, 14 Aug 2011 18:07:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1157587 - /commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java Date: Sun, 14 Aug 2011 18:07:54 -0000 To: commits@commons.apache.org From: tv@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110814180754.609722388A33@eris.apache.org> Author: tv Date: Sun Aug 14 18:07:54 2011 New Revision: 1157587 URL: http://svn.apache.org/viewvc?rev=1157587&view=rev Log: Fixed NPE on access Modified: commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java Modified: commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java?rev=1157587&r1=1157586&r2=1157587&view=diff ============================================================================== --- commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java (original) +++ commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/memory/lru/LHMLRUMemoryCache.java Sun Aug 14 18:07:54 2011 @@ -125,23 +125,24 @@ public class LHMLRUMemoryCache public synchronized ICacheElement get( Serializable key ) throws IOException { - ICacheElement ce = null; + MemoryElementDescriptor me = null; if ( log.isDebugEnabled() ) { log.debug( "getting item from cache " + cacheName + " for key " + key ); } - ce = map.get( key ).ce; + me = map.get( key ); - if ( ce != null ) + if ( me != null ) { hitCnt++; - ce.getElementAttributes().setLastAccessTimeNow(); + me.ce.getElementAttributes().setLastAccessTimeNow(); if ( log.isDebugEnabled() ) { log.debug( cacheName + ": LRUMemoryCache hit for " + key ); } + return me.ce; } else { @@ -149,7 +150,7 @@ public class LHMLRUMemoryCache log.debug( cacheName + ": LRUMemoryCache miss for " + key ); } - return ce; + return null; } /**