Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2010-02-19 22:37:11 +0000
committerThomas Watson2010-02-19 22:37:11 +0000
commitef5eaa557123b6d28f39f54f61452476f34b55f7 (patch)
tree7d728844c400124758fb459862a8acbe48b2761c /bundles
parentb4f7c1756a7880a1f5dafd18f362a3c3e5b56ae0 (diff)
downloadrt.equinox.framework-ef5eaa557123b6d28f39f54f61452476f34b55f7.tar.gz
rt.equinox.framework-ef5eaa557123b6d28f39f54f61452476f34b55f7.tar.xz
rt.equinox.framework-ef5eaa557123b6d28f39f54f61452476f34b55f7.zip
Bug 303071 - The framework should fail to launch if the storage area (configuration) cannot be locked
Need to change var useReliableFiles back to non-static to allow tests to set it when constructing new managers.
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java
index 4642b693d..3ebfe71c1 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java
@@ -93,7 +93,8 @@ public final class StorageManager {
private static final String TABLE_FILE = ".fileTable"; //$NON-NLS-1$
private static final String LOCK_FILE = ".fileTableLock"; //$NON-NLS-1$
private static final int MAX_LOCK_WAIT = 5000; // 5 seconds
- private static final boolean useReliableFiles = Boolean.valueOf(secure.getProperty("osgi.useReliableFiles")).booleanValue(); //$NON-NLS-1$
+ // this should be static but the tests expect to be able to create new managers after changing this setting dynamically
+ private final boolean useReliableFiles = Boolean.valueOf(secure.getProperty("osgi.useReliableFiles")).booleanValue(); //$NON-NLS-1$
private class Entry {
int readId;

Back to the top