Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2019-01-09 09:05:47 -0500
committerThomas Watson2019-06-27 15:13:01 -0400
commitd93c643cf31f1786061a02117355d50880580f9d (patch)
tree514e72de0bc6ded224df29bc105fcd2d8ad85be3
parent6dc8e3305585643b3835cec08bc87c09b6456446 (diff)
downloadrt.equinox.framework-R4_6_maintenance.tar.gz
rt.equinox.framework-R4_6_maintenance.tar.xz
rt.equinox.framework-R4_6_maintenance.zip
Bug 541638 - Increase default value for osgi.module.lock.timeoutR4_6_maintenance
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.java8
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java4
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 f9a7eea6c..89f84d4ad 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
@@ -11,7 +11,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 {
@@ -20,7 +22,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()));
}
@@ -35,7 +37,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 9470dceb9..91a1bee74 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
@@ -105,7 +105,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 {
@@ -115,7 +115,7 @@ public final class ModuleContainer implements DebugOptionsListener {
tempModuleLockTimeout = 1;
}
} catch (NumberFormatException e) {
- // will default to 5
+ // will default to 30
}
}
this.moduleLockTimeout = tempModuleLockTimeout;

Back to the top