diff options
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java | 8 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java b/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java index bd620608c..6970f0e93 100644 --- a/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java +++ b/bundles/org.eclipse.osgi.tests/bundles_src/thread.locktest/thread/locktest/Activator.java @@ -14,7 +14,9 @@ package thread.locktest; import org.eclipse.osgi.tests.bundles.AbstractBundleTests; -import org.osgi.framework.*; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; public class Activator implements BundleActivator, Runnable { @@ -23,7 +25,7 @@ public class Activator implements BundleActivator, Runnable { System.out.println("about to start thread"); thread.start(); System.out.println("about to join the thread"); - thread.join(10000); + thread.join(40000); System.out.println("after joining thread"); AbstractBundleTests.simpleResults.addEvent(new BundleEvent(BundleEvent.STARTED, context.getBundle())); } @@ -38,7 +40,7 @@ public class Activator implements BundleActivator, Runnable { new Class1(); long totalTime = System.currentTimeMillis() - startTime; System.out.println("loaded Class1 " + totalTime); - if (totalTime < 10000) + if (totalTime < 40000) AbstractBundleTests.simpleResults.addEvent(new Long(5000)); } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java index 1372e0d55..89420d8ba 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java @@ -141,7 +141,7 @@ public final class ModuleContainer implements DebugOptionsListener { this.moduleDatabase = moduledataBase; this.frameworkWiring = new ContainerWiring(); this.frameworkStartLevel = new ContainerStartLevel(); - long tempModuleLockTimeout = 5; + long tempModuleLockTimeout = 30; String moduleLockTimeoutProp = adaptor.getProperty(EquinoxConfiguration.PROP_MODULE_LOCK_TIMEOUT); if (moduleLockTimeoutProp != null) { try { @@ -151,7 +151,7 @@ public final class ModuleContainer implements DebugOptionsListener { tempModuleLockTimeout = 1; } } catch (NumberFormatException e) { - // will default to 5 + // will default to 30 } } this.moduleLockTimeout = tempModuleLockTimeout; |