diff options
author | Eike Stepper | 2022-10-23 06:19:31 +0000 |
---|---|---|
committer | Eike Stepper | 2022-10-23 06:19:31 +0000 |
commit | add5d1a2a83d61fbc782a2e4801dff2c190e4aac (patch) | |
tree | cfb6b45da91635e13a9e9618690bc40156cf4699 /plugins/org.eclipse.emf.cdo.common/src/org | |
parent | 7f5c0bd0d6bb678f81beea15da58b795b60a3364 (diff) | |
download | cdo-add5d1a2a83d61fbc782a2e4801dff2c190e4aac.tar.gz cdo-add5d1a2a83d61fbc782a2e4801dff2c190e4aac.tar.xz cdo-add5d1a2a83d61fbc782a2e4801dff2c190e4aac.zip |
[580943] NPE in CDOCommitInfoManagerImpl.getLastCommitOfBranch()
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common/src/org')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java index 7247e6280a..a24b88cd75 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java @@ -337,8 +337,11 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr if (lastCommit == CDOBranchPoint.UNSPECIFIED_DATE && loadOnDemand) { CDOCommitInfo last = loadLastOfBranch(branch); - infoCache.setLast(last); - lastCommit = last.getTimeStamp(); + if (last != null) + { + infoCache.setLast(last); + lastCommit = last.getTimeStamp(); + } } return lastCommit; @@ -531,12 +534,15 @@ public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBr public void setLast(CDOCommitInfo last) { - this.last = new SoftReference<>(last); - - long timeStamp = last.getTimeStamp(); - if (timeStamp > lastCommit) + if (last != null) { - lastCommit = timeStamp; + this.last = new SoftReference<>(last); + + long timeStamp = last.getTimeStamp(); + if (timeStamp > lastCommit) + { + lastCommit = timeStamp; + } } } |