summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-06 04:16:01 (EDT)
committerEike Stepper2007-07-06 04:16:01 (EDT)
commit3f16c0f3d2dc3aa9f7483672d13f8ba5f0f8dfca (patch)
treec2bb260244af65655f71eb32991b6b3bcbb7ccf9
parentf6d868a4b44980e1a44de1a70c00d3ed814a1323 (diff)
downloadcdo-3f16c0f3d2dc3aa9f7483672d13f8ba5f0f8dfca.zip
cdo-3f16c0f3d2dc3aa9f7483672d13f8ba5f0f8dfca.tar.gz
cdo-3f16c0f3d2dc3aa9f7483672d13f8ba5f0f8dfca.tar.bz2
task 1: Develop 0.8.0
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryManagerImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryManager.java2
3 files changed, 4 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryManagerImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryManagerImpl.java
index af53e05..6b2777f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryManagerImpl.java
@@ -34,18 +34,13 @@ public final class RepositoryManagerImpl implements RepositoryManager
RepositoryImpl repository = repositories.get(name);
if (repository == null && createOnDemand)
{
- repository = openRepository(name);
+ repository = new RepositoryImpl(name);
repositories.put(name, repository);
}
return repository;
}
- private RepositoryImpl openRepository(String name)
- {
- return new RepositoryImpl(name);
- }
-
public boolean isEmpty()
{
return repositories.isEmpty();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
index 4e1c01d..1565dd3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
@@ -59,7 +59,7 @@ public class OpenSessionIndication extends IndicationWithResponse
@Override
protected void responding(ExtendedDataOutputStream out) throws IOException
{
- RepositoryImpl repository = RepositoryManagerImpl.INSTANCE.getRepository(repositoryName);
+ RepositoryImpl repository = RepositoryManagerImpl.INSTANCE.getRepository(repositoryName, true);
if (repository == null)
{
if (PROTOCOL.isEnabled())
@@ -85,7 +85,7 @@ public class OpenSessionIndication extends IndicationWithResponse
return;
}
- (serverProtocol).setSession(session);
+ serverProtocol.setSession(session);
writeSessionID(out, session);
writeRepositoryUUID(out, repository);
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryManager.java
index f727cfa..5362b81 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryManager.java
@@ -19,5 +19,5 @@ public interface RepositoryManager
{
public static final RepositoryManager INSTANCE = RepositoryManagerImpl.INSTANCE;
- public Repository getRepository(String name);
+ public Repository getRepository(String name, boolean createOnDemand);
}