diff options
| author | Andrey Loskutov | 2019-01-09 14:05:47 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2019-01-09 14:29:53 +0000 |
| commit | 23a1ba9b7bd355860c000fa16e4f8359054e35b6 (patch) | |
| tree | b99d0304c46fe00eeb60e731885d3c135e68003f | |
| parent | 79e672bcbfdb99bd8b26771d9cfa859e531a908a (diff) | |
| download | rt.equinox.framework-23a1ba9b7bd355860c000fa16e4f8359054e35b6.tar.gz rt.equinox.framework-23a1ba9b7bd355860c000fa16e4f8359054e35b6.tar.xz rt.equinox.framework-23a1ba9b7bd355860c000fa16e4f8359054e35b6.zip | |
Bug 541638 - Increase default value for osgi.module.lock.timeoutY20190109-2200S4_11_0_M1I20190109-1800
Increased default timeout fro 5 to 30 seconds.
Change-Id: I228f94ba6d8f915b66ca5f4e12baab0ba7f55ef0
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
| -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; |