summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-06 02:37:54 (EDT)
committerEike Stepper2007-08-06 02:37:54 (EDT)
commit9fb1673fe1a96a14dbbdd5f858f033998dcae27d (patch)
tree53d9a486de56170510d2eb5854ee45023299e62e
parentf3ae66f9e99e25249b5b5ac9e6e30508c2e3e2a6 (diff)
downloadcdo-9fb1673fe1a96a14dbbdd5f858f033998dcae27d.zip
cdo-9fb1673fe1a96a14dbbdd5f858f033998dcae27d.tar.gz
cdo-9fb1673fe1a96a14dbbdd5f858f033998dcae27d.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryPackageManager.java14
2 files changed, 13 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
index 67875b2..375fc98 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
@@ -59,13 +59,12 @@ public class Repository extends Lifecycle implements IRepository
this.name = name;
this.store = store;
this.uuid = UUID.randomUUID().toString();
+ store.setRepository(this);
packageManager = new RepositoryPackageManager(this);
sessionManager = new SessionManager(this);
resourceManager = new ResourceManager(this);
revisionManager = new RevisionManager(this);
-
- store.setRepository(this);
}
public String getName()
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryPackageManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryPackageManager.java
index 2e5265c..18c6f0a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryPackageManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryPackageManager.java
@@ -43,7 +43,14 @@ public class RepositoryPackageManager extends CDOPackageManagerImpl
cdoPackage.setMetaIDRange(newRange);
}
- repository.getStore().addPackage(this, cdoPackage);
+ if (cdoPackage.isSystem())
+ {
+ addPackageToCache(cdoPackage);
+ }
+ else
+ {
+ repository.getStore().addPackage(this, cdoPackage);
+ }
}
public void addPackageToCache(CDOPackageImpl cdoPackage)
@@ -54,7 +61,10 @@ public class RepositoryPackageManager extends CDOPackageManagerImpl
@Override
protected void resolve(CDOPackageImpl cdoPackage)
{
- repository.getStore().loadPackage(cdoPackage);
+ if (!cdoPackage.isSystem())
+ {
+ repository.getStore().loadPackage(cdoPackage);
+ }
}
@Override