commit 85a99e54e3a4828edc74b72011d0dfa920486446
author Karl Pauls <pauls@apache.org> Tue Jan 11 21:14:18 2011 +0000
committer Karl Pauls <pauls@apache.org> Tue Jan 11 21:14:18 2011 +0000
tree 52fb9d696301f7d95006eadfe2025ff01b7cf5cc
parent b161dcb06a67f6a090b732181cdaac77bbc05273

Avoid using the FileLock class if cache locking is disabled to support < java5 vms (FELIX-2749)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1057869 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java

diff --git a/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java b/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
index 1281e44..9505425 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
@@ -87,7 +87,7 @@
 
     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 @@
         {
             try
             {
-                m_lock.release();
-                m_lock.channel().close();
+                ((FileLock) m_lock).release();
+                ((FileLock) m_lock).channel().close();
             }
             catch (Exception ex)
             {