From 8b14e30c2894902f33653ecac38332cb4bb84f11 Mon Sep 17 00:00:00 2001
From: Andrew Su <asu@redhat.com>
Date: Thu, 17 Mar 2011 15:10:32 -0400
Subject: Ensure that javaws can not clear cache while plugin or javaws is
running.
---
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
(limited to 'netx/net/sourceforge/jnlp/cache/CacheUtil.java')
diff --git a/netx/net/sourceforge/jnlp/cache/CacheUtil.java b/netx/net/sourceforge/jnlp/cache/CacheUtil.java
index bb88325..4143738 100644
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java
@@ -165,23 +165,20 @@ public class CacheUtil {
try {
if (otherJavawsRunning.isFile()) {
FileOutputStream fis = new FileOutputStream(otherJavawsRunning);
- try {
- FileChannel channel = fis.getChannel();
- if (channel.tryLock() == null) {
- if (JNLPRuntime.isDebug()) {
- System.out.println("Other instances of netx are running");
- }
- return false;
- }
-
+
+ FileChannel channel = fis.getChannel();
+ if (channel.tryLock() == null) {
if (JNLPRuntime.isDebug()) {
- System.out.println("No other instances of netx are running");
+ System.out.println("Other instances of netx are running");
}
- return true;
+ return false;
+ }
- } finally {
- fis.close();
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("No other instances of netx are running");
}
+ return true;
+
} else {
if (JNLPRuntime.isDebug()) {
System.out.println("No instance file found");
--
cgit v1.2.3