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)
{