summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-20 15:57:59 (EDT)
committerEike Stepper2007-07-20 15:57:59 (EDT)
commiteca67bcfca7f7e9e36a09db72141aa79c5003b45 (patch)
tree1947cf8a05a1a527d9facf249eab872a74a76444
parente6dbaf2b910f7d4581df13efce5b9be54412bf29 (diff)
downloadcdo-eca67bcfca7f7e9e36a09db72141aa79c5003b45.zip
cdo-eca67bcfca7f7e9e36a09db72141aa79c5003b45.tar.gz
cdo-eca67bcfca7f7e9e36a09db72141aa79c5003b45.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java14
1 files changed, 10 insertions, 4 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 1d33a10..fdfd4a6 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
@@ -285,13 +285,19 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
public CDOID convertReference(Object idOrObject)
{
- CDOID id = (CDOID)getCDOID_IfPossible(idOrObject);
- if (TRACER.isEnabled())
+ Object shouldBeCDOID = getCDOID_IfPossible(idOrObject);
+ if (shouldBeCDOID instanceof CDOID)
{
- TRACER.format("Converted dangling reference: {0} --> {1}", idOrObject, id);
+ CDOID id = (CDOID)shouldBeCDOID;
+ if (TRACER.isEnabled())
+ {
+ TRACER.format("Converted dangling reference: {0} --> {1}", idOrObject, id);
+ }
+
+ return id;
}
- return id;
+ throw new ImplementationError("Not a CDOID: " + shouldBeCDOID);
}
// public final class HistoryEntryImpl implements HistoryEntry, Comparable