Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-04-11 06:50:24 +0000
committerEike Stepper2013-04-11 06:50:24 +0000
commitb5dc7b3338c602d6ad77c1f67a64718be7115bd2 (patch)
tree04b6aac3dac3731725e4449fea1c0ec13bbcc418 /plugins/org.eclipse.emf.cdo.ui
parent4280908ac24814f10686075c911e0612b4e72e7b (diff)
downloadcdo-b5dc7b3338c602d6ad77c1f67a64718be7115bd2.tar.gz
cdo-b5dc7b3338c602d6ad77c1f67a64718be7115bd2.tar.xz
cdo-b5dc7b3338c602d6ad77c1f67a64718be7115bd2.zip
[405423] [UI] NPE in
org.eclipse.emf.cdo.internal.ui.history.Net.getOrCreateSegment() https://bugs.eclipse.org/bugs/show_bug.cgi?id=405423
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java
index efb587d169..edf813f47d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java
@@ -197,7 +197,7 @@ public class Net
continue;
}
- if (lastSegment.getLastCommitTime() == lastCommit.getTime())
+ if (lastCommit != null && lastCommit.getTime() == lastSegment.getLastCommitTime())
{
// Don't block the track of the last commit
continue;

Back to the top