Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 52773 invoked from network); 11 Jan 2011 21:14:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Jan 2011 21:14:48 -0000 Received: (qmail 56453 invoked by uid 500); 11 Jan 2011 21:14:48 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 56406 invoked by uid 500); 11 Jan 2011 21:14:47 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 56399 invoked by uid 99); 11 Jan 2011 21:14:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jan 2011 21:14:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 11 Jan 2011 21:14:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2B89F23888CF; Tue, 11 Jan 2011 21:14:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1057869 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java Date: Tue, 11 Jan 2011 21:14:19 -0000 To: commits@felix.apache.org From: pauls@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110111211419.2B89F23888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pauls Date: Tue Jan 11 21:14:18 2011 New Revision: 1057869 URL: http://svn.apache.org/viewvc?rev=1057869&view=rev Log: Avoid using the FileLock class if cache locking is disabled to support < java5 vms (FELIX-2749) Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java?rev=1057869&r1=1057868&r2=1057869&view=diff ============================================================================== --- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java (original) +++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java Tue Jan 11 21:14:18 2011 @@ -87,7 +87,7 @@ public class BundleCache private final Logger m_logger; private final Map m_configMap; - private final FileLock m_lock; + private final Object m_lock; public BundleCache(Logger logger, Map configMap) throws Exception @@ -164,8 +164,8 @@ public class BundleCache { try { - m_lock.release(); - m_lock.channel().close(); + ((FileLock) m_lock).release(); + ((FileLock) m_lock).channel().close(); } catch (Exception ex) {