diff options
| author | Eike Stepper | 2020-10-25 09:57:47 +0000 |
|---|---|---|
| committer | Eike Stepper | 2020-10-25 09:57:47 +0000 |
| commit | 7161aaff0b745323b54923c76ab7664936ddc08d (patch) | |
| tree | 0e68fd0a3a72715d5580c63c8ff8437886ed72a8 /plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf | |
| parent | c86c2959746371eb34046803efc03818884a04ab (diff) | |
| download | cdo-7161aaff0b745323b54923c76ab7664936ddc08d.tar.gz cdo-7161aaff0b745323b54923c76ab7664936ddc08d.tar.xz cdo-7161aaff0b745323b54923c76ab7664936ddc08d.zip | |
[568211] [DB] Avoid ClassCastException in DBStoreAccessor.applyIDMappings()
https://bugs.eclipse.org/bugs/show_bug.cgi?id=568211
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java index 1186e4578d..02c50d88e1 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java @@ -21,6 +21,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; import org.eclipse.emf.cdo.common.branch.CDOBranchVersion; import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler; import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.common.lob.CDOLobHandler; import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockArea.Handler; import org.eclipse.emf.cdo.common.model.CDOClassifierRef; @@ -536,7 +537,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor, { CDOID id = revision.getID(); - if (adjustMaxID && idHandler.compare(id, maxID) > 0) + if (adjustMaxID && (CDOIDUtil.isNull(maxID) || idHandler.compare(id, maxID) > 0)) { maxID = id; } |