Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McDuff2008-10-28 14:00:35 +0000
committerSimon McDuff2008-10-28 14:00:35 +0000
commit2a61d4ffabe3f0d04b6c417335a092b9c2d59d2c (patch)
tree80256ad99821ba94d9377459ad73996bb2a47d99 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
parente032e6a8f73447b4d9e89f1f0d4a90da19eefb9e (diff)
downloadcdo-2a61d4ffabe3f0d04b6c417335a092b9c2d59d2c.tar.gz
cdo-2a61d4ffabe3f0d04b6c417335a092b9c2d59d2c.tar.xz
cdo-2a61d4ffabe3f0d04b6c417335a092b9c2d59d2c.zip
[252214] NPE when calling audit.setTimeStamp()
https://bugs.eclipse.org/bugs/show_bug.cgi?id=252214
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 9ec886f528..b9aa30f2df 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -1177,7 +1177,12 @@ public class CDOViewImpl extends org.eclipse.net4j.util.event.Notifier implement
for (InternalCDOObject object : objects.values())
{
CDORevision revision = object.cdoRevision();
- if (!revision.isValid(timeStamp))
+ if (revision == null)
+ {
+ revision = getRevision(object.cdoID(), false);
+ }
+
+ if (revision == null || !revision.isValid(timeStamp))
{
result.add(object);
}

Back to the top