Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormvelten2012-08-06 05:22:51 -0400
committermvelten2012-08-06 05:22:51 -0400
commitdc499ff8e46fa5570576552decc292d46189438f (patch)
tree3ff49f68135a3d96133253ef94f00508f12aeb7b /plugins
parent6fd890c30104a620a13c7160c3d99ed6a2b31a04 (diff)
downloadorg.eclipse.papyrus-dc499ff8e46fa5570576552decc292d46189438f.tar.gz
org.eclipse.papyrus-dc499ff8e46fa5570576552decc292d46189438f.tar.xz
org.eclipse.papyrus-dc499ff8e46fa5570576552decc292d46189438f.zip
NEW - bug 386662: [Resource Loading] getEObject on the ModelSet return null when loadondemand is false
https://bugs.eclipse.org/bugs/show_bug.cgi?id=386662
Diffstat (limited to 'plugins')
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java
index 3f2a464aa2b..9a82c5802d6 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java
@@ -76,7 +76,9 @@ public class OnDemandLoadingModelSet extends DiResourceSet {
} else if(loadOnDemand) {
return proxyManager.getEObjectFromStrategy(uri);
} else {
- return null;
+ // call super so that the eobject is returned
+ // if the resource is already loaded
+ return super.getEObject(uri, loadOnDemand);
}
}

Back to the top