Description Christian Schneider 2014-11-20 10:05:40 EST

The method 'ensureModelLinked(...)' in 'Linker' clears all references of an EObject
regardless the fact that those reference represent eOpposite of others.
This way reference of already linked EObjects may be cleared again, since those eOpposites are usually not mentioned in the grammar.

Instead of:

protected void ensureModelLinked(EObject model, final IDiagnosticProducer producer) {
  boolean clearAllReferencesRequired = isClearAllReferencesRequired(model.eResource());
  TreeIterator<EObject> iterator = getAllLinkableContents(model);
  while(iterator.hasNext()) {
    EObject next = iterator.next();
    if (clearAllReferencesRequired) {
      clearReferences(next);
    }
    ensureLinked(next, producer);
  }
}

we suggest:

protected void ensureModelLinked(EObject model, final IDiagnosticProducer producer) {
    boolean clearAllReferencesRequired = isClearAllReferencesRequired(model.eResource());
    TreeIterator<EObject> iterator = getAllLinkableContents(model);

    // first clear all (possibly invalid) references
    if (clearAllReferencesRequired) {
        while (iterator.hasNext()) {
            clearReferences(iterator.next());
        }
    }

    // re-link
    iterator = getAllLinkableContents(model);
    while (iterator.hasNext()) {
        ensureLinked(iterator.next(), producer);
    }
}