diff options
| author | Eike Stepper | 2011-04-11 06:43:53 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-04-11 06:43:53 +0000 |
| commit | fe2f58756697bfaeb29f69a65a65602e80e21124 (patch) | |
| tree | 48125147b9fbb0218ac2e7af5cb84d1534857f44 /plugins/org.eclipse.emf.cdo.common | |
| parent | 469768da5b8978dc1efc54f1dc03d74d8de6b364 (diff) | |
| download | cdo-fe2f58756697bfaeb29f69a65a65602e80e21124.tar.gz cdo-fe2f58756697bfaeb29f69a65a65602e80e21124.tar.xz cdo-fe2f58756697bfaeb29f69a65a65602e80e21124.zip | |
[338821] CDOCommitInfoImpl.merge() doesn't load commit data if needed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=338821
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java index 0dc93ce796..5d39e62ce9 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java @@ -87,10 +87,8 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn public void merge(CDOChangeSetData changeSetData) { - if (commitData != null) - { - commitData.merge(changeSetData); - } + loadCommitDataIfNeeded(); + commitData.merge(changeSetData); } public synchronized List<CDOPackageUnit> getNewPackageUnits() |