Merge pull request #360 from bci-oss/bugfix/code-generation-issue

Bugfix/code generation issue

Author: atextor

AUTHORS.md

@@ -1,19 +1,19 @@
-# Authors 
+# Authors
 
 The following people have contributed to this repository:
 
 * Birgit Boss, Robert Bosch GmbH
 * Daniel Ewert, Robert Bosch GmbH, [email protected]
-* Dennis Melzer, Robert Bosch GmbH, georg.schmidt-dumont@de.bosch.com
+* Dennis Melzer, Robert Bosch GmbH, Dennis.Melzer@de.bosch.com
 * Misecka Rastislav, Systecs Informationssysteme GmbH
 * Fethuallah Misir, Robert Bosch GmbH, [email protected]
 * Michele Santoro
 * Andreas Schilling, [email protected]
-* Georg Schmidt-Dumont, Robert Bosch GmbH, [email protected] 
-* David Schmitt, Systecs Informationssysteme GmbH
+* Georg Schmidt-Dumont, Robert Bosch GmbH, [email protected]
+* David Schmitt, Robert Bosch GmbH, [email protected]
 * Andreas Textor, [email protected]
 * Peter Triebe, [email protected]
-* Julian Walbrecht,  ulian[email protected]
+* Julian Walbrecht, Julian[email protected]
 * Sven Walter, [email protected]
 * Sven Erik Jeroschewski, Bosch.IO GmbH
 * Lukas Römer, Bosch.IO GmbH, [email protected]

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/impl/DefaultComplexType.java

@@ -15,11 +15,11 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
@@ -35,7 +35,7 @@ public class DefaultComplexType extends ModelElementImpl implements ComplexType
     * Used to keep track of all {@link ComplexType} instances regardles of whether they are directly or indirectly
     * referenced in the {@link Aspect}.
     */
-   private static final WeakHashMap<AspectModelUrn, ComplexType> instances = new WeakHashMap<>();
+   private static final HashMap<AspectModelUrn, ComplexType> instances = new HashMap<>();
 
    private final List<Property> properties;
    private final Optional<ComplexType> _extends;

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/loader/instantiator/ComplexTypeInstantiator.java

@@ -85,8 +85,6 @@ public T apply( final Resource resource ) {
 
       extending.addAll( getExtending( resource ) );
 
-      creatingElements.remove( resource );
-
       return entity;
    }