Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-05-04 05:28:45 +0000
committerEike Stepper2016-05-04 05:28:45 +0000
commitbde54d702d2479c8b5a38f68458657badb8a1295 (patch)
tree4edf38db50756cddbd39535ce77a836503cde47f /plugins
parente164a8f10f412b2d282228f27bf134ad941f404b (diff)
downloadcdo-bde54d702d2479c8b5a38f68458657badb8a1295.tar.gz
cdo-bde54d702d2479c8b5a38f68458657badb8a1295.tar.xz
cdo-bde54d702d2479c8b5a38f68458657badb8a1295.zip
[492791] Factory not found: org.eclipse.emf.cdo.server.queryHandlerFactories[ocl]
https://bugs.eclipse.org/bugs/show_bug.cgi?id=492791
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java8
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java24
2 files changed, 12 insertions, 20 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
index 703338ecb2..1b288ce816 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.cdo.internal.server.syncing.RepositorySynchronizer;
import org.eclipse.emf.cdo.session.CDOSessionConfigurationFactory;
import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
import org.eclipse.emf.cdo.spi.common.revision.ManagedRevisionProvider;
+import org.eclipse.emf.cdo.spi.server.InternalRepository;
import org.eclipse.emf.cdo.spi.server.InternalRepositorySynchronizer;
import org.eclipse.emf.cdo.spi.server.InternalSession;
import org.eclipse.emf.cdo.spi.server.InternalStore;
@@ -33,6 +34,7 @@ import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.container.IManagedContainer;
+import org.eclipse.net4j.util.container.IPluginContainer;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.om.OMPlatform;
@@ -284,6 +286,12 @@ public final class CDOServerUtil
public static void addRepository(IManagedContainer container, IRepository repository)
{
+ InternalRepository internal = (InternalRepository)repository;
+ if (internal.getContainer() == null && container != IPluginContainer.INSTANCE)
+ {
+ internal.setContainer(container);
+ }
+
String productGroup = RepositoryFactory.PRODUCT_GROUP;
String type = RepositoryFactory.TYPE;
String name = repository.getName();
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
index cd8a984fa7..f7338b3bbf 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
@@ -517,40 +517,24 @@ public abstract class AbstractOMTest extends TestCase
return (AbstractOMTest)TestExecuter.getValue();
}
- /**
- * @deprecated Use assertEquals(message, true, ...)
- */
- @Deprecated
public static void assertTrue(String message, boolean condition)
{
- throw new UnsupportedOperationException("Use assertEquals(message, true, ...)");
+ assertEquals(message, true, condition);
}
- /**
- * @deprecated Use assertEquals(true, ...)
- */
- @Deprecated
public static void assertTrue(boolean condition)
{
- throw new UnsupportedOperationException("Use assertEquals(true, ...)");
+ assertEquals(true, condition);
}
- /**
- * @deprecated Use assertEquals(message, false, ...)
- */
- @Deprecated
public static void assertFalse(String message, boolean condition)
{
- throw new UnsupportedOperationException("Use assertEquals(message, false, ...)");
+ assertEquals(message, false, condition);
}
- /**
- * @deprecated Use assertEquals(false, ...)
- */
- @Deprecated
public static void assertFalse(boolean condition)
{
- throw new UnsupportedOperationException("Use assertEquals(false, ...)");
+ assertEquals(false, condition);
}
public static void assertEquals(Object[] expected, Object[] actual)

Back to the top