Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-06-12 07:02:29 +0000
committerEike Stepper2008-06-12 07:02:29 +0000
commit00f8139457775472975dd1f2eba0d7d6a4877aa3 (patch)
tree1c5b6fd6d33034ebc1d4806561e73c6dcfd0fe9c /plugins
parentf9f2b426a41a42d3ae927feab86de7955476feba (diff)
downloadcdo-00f8139457775472975dd1f2eba0d7d6a4877aa3.tar.gz
cdo-00f8139457775472975dd1f2eba0d7d6a4877aa3.tar.xz
cdo-00f8139457775472975dd1f2eba0d7d6a4877aa3.zip
[236784] Invalidate and cache problem
https://bugs.eclipse.org/bugs/show_bug.cgi?id=236784
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOFeatureImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java2
2 files changed, 9 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOFeatureImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOFeatureImpl.java
index 5448b80180..b5b14f52f9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOFeatureImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOFeatureImpl.java
@@ -264,8 +264,14 @@ public class CDOFeatureImpl extends CDOModelElementImpl implements InternalCDOFe
@Override
public String toString()
{
- return MessageFormat.format("CDOFeature(ID={0}, name={1}, type={2}, referenceType={3})", featureID, getName(),
- getType(), getReferenceTypeProxy());
+ if (type == CDOType.OBJECT)
+ {
+ return MessageFormat.format("CDOFeature(ID={0}, name={1}, type={2})", featureID, getName(), referenceTypeProxy);
+ }
+ else
+ {
+ return MessageFormat.format("CDOFeature(ID={0}, name={1}, type={2})", featureID, getName(), type);
+ }
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
index ed92e59364..0b1a84e601 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
@@ -73,7 +73,7 @@ public class SessionTest extends AbstractCDOTest
msg("\n\n\n\n\n\n\n\n\n\n\nCommitting");
transactionB.commit();
- // Thread.sleep(1000);
+ Thread.sleep(200);
msg("Checking after commit");
boolean timedOut = new PollingTimeOuter(200, 100)

Back to the top