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 59644b2..67687d2 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
@@ -105,7 +105,6 @@
         File lockFile = new File(cacheDir, CACHE_LOCK_NAME);
         FileChannel fc = null;
         FileOutputStream fos = null;
-        FileInputStream fis = null;
         try
         {
             if (!getSecureAction().fileExists(lockFile))
@@ -115,8 +114,8 @@
             }
             else
             {
-                fis = getSecureAction().getFileInputStream(lockFile);
-                fc = fis.getChannel();
+                fos = getSecureAction().getFileOutputStream(lockFile);
+                fc = fos.getChannel();
             }
         }
         catch (Exception ex)
@@ -124,7 +123,6 @@
             try
             {
                 if (fos != null) fos.close();
-                if (fis != null) fis.close();
                 if (fc != null) fc.close();
             }
             catch (Exception ex2)
