Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-07-05 14:35:58 -0400
committerEike Stepper2011-07-05 14:35:58 -0400
commit94ac67f8cc12d1e43137428370843378a902634a (patch)
tree0236ef215d69d5670c3d43c5b2ea73ab633b6bfd /plugins
parente352dd435bffd43cd0ea22e04f58b599ef8ce43c (diff)
downloadcdo-94ac67f8cc12d1e43137428370843378a902634a.tar.gz
cdo-94ac67f8cc12d1e43137428370843378a902634a.tar.xz
cdo-94ac67f8cc12d1e43137428370843378a902634a.zip
[350649] Offline test and example failures
https://bugs.eclipse.org/bugs/show_bug.cgi?id=350649
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java32
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueWorker.java7
2 files changed, 22 insertions, 17 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java
index 89dc19a954..aea655bd2a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java
@@ -55,12 +55,12 @@ public class Scenario implements IScenario
{
}
- public synchronized IContainerConfig getContainerConfig()
+ public IContainerConfig getContainerConfig()
{
return containerConfig;
}
- public synchronized void setContainerConfig(IContainerConfig containerConfig)
+ public void setContainerConfig(IContainerConfig containerConfig)
{
configs = null;
this.containerConfig = containerConfig;
@@ -70,12 +70,12 @@ public class Scenario implements IScenario
}
}
- public synchronized IRepositoryConfig getRepositoryConfig()
+ public IRepositoryConfig getRepositoryConfig()
{
return repositoryConfig;
}
- public synchronized void setRepositoryConfig(IRepositoryConfig repositoryConfig)
+ public void setRepositoryConfig(IRepositoryConfig repositoryConfig)
{
configs = null;
this.repositoryConfig = repositoryConfig;
@@ -85,12 +85,12 @@ public class Scenario implements IScenario
}
}
- public synchronized ISessionConfig getSessionConfig()
+ public ISessionConfig getSessionConfig()
{
return sessionConfig;
}
- public synchronized void setSessionConfig(ISessionConfig sessionConfig)
+ public void setSessionConfig(ISessionConfig sessionConfig)
{
configs = null;
this.sessionConfig = sessionConfig;
@@ -100,12 +100,12 @@ public class Scenario implements IScenario
}
}
- public synchronized IModelConfig getModelConfig()
+ public IModelConfig getModelConfig()
{
return modelConfig;
}
- public synchronized void setModelConfig(IModelConfig modelConfig)
+ public void setModelConfig(IModelConfig modelConfig)
{
configs = null;
this.modelConfig = modelConfig;
@@ -116,13 +116,13 @@ public class Scenario implements IScenario
}
@Override
- public synchronized String toString()
+ public String toString()
{
return MessageFormat.format("Scenario[{0}, {1}, {2}, {3}]", //
getContainerConfig(), getRepositoryConfig(), getSessionConfig(), getModelConfig());
}
- public synchronized Set<IConfig> getConfigs()
+ public Set<IConfig> getConfigs()
{
if (configs == null)
{
@@ -136,7 +136,7 @@ public class Scenario implements IScenario
return configs;
}
- public synchronized boolean isValid()
+ public boolean isValid()
{
Set<IConfig> configs = getConfigs();
for (IConfig config : configs)
@@ -150,12 +150,12 @@ public class Scenario implements IScenario
return true;
}
- public synchronized ConfigTest getCurrentTest()
+ public ConfigTest getCurrentTest()
{
return currentTest;
}
- public synchronized void setCurrentTest(ConfigTest currentTest)
+ public void setCurrentTest(ConfigTest currentTest)
{
this.currentTest = currentTest;
if (containerConfig != null)
@@ -179,7 +179,7 @@ public class Scenario implements IScenario
}
}
- public synchronized void setUp() throws Exception
+ public void setUp() throws Exception
{
try
{
@@ -205,7 +205,7 @@ public class Scenario implements IScenario
}
}
- public synchronized void tearDown() throws Exception
+ public void tearDown() throws Exception
{
try
{
@@ -244,7 +244,7 @@ public class Scenario implements IScenario
}
}
- public synchronized void save()
+ public void save()
{
File file = getStateFile();
ObjectOutputStream stream = null;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueWorker.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueWorker.java
index b875750853..3952a9ee10 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueWorker.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueWorker.java
@@ -20,13 +20,18 @@ import java.util.concurrent.TimeUnit;
*/
public abstract class QueueWorker<E> extends Worker
{
+ /**
+ * @since 3.2
+ */
+ public static final int DEFAULT_POLL_MILLIS = 100;
+
private BlockingQueue<E> queue;
private long pollMillis;
public QueueWorker()
{
- setPollMillis(100);
+ setPollMillis(DEFAULT_POLL_MILLIS);
}
public long getPollMillis()

Back to the top