#102 Check that substitute type is complex before checking if type is…

… abstract
entur · Nov 23, 2020 · 39a2e74 · 39a2e74
1 parent cd349fa
commit 39a2e74
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/schema2proto-lib/src/main/java/no/entur/schema2proto/generateproto/SchemaParser.java b/schema2proto-lib/src/main/java/no/entur/schema2proto/generateproto/SchemaParser.java
@@ -385,7 +385,8 @@ private void navigateSubTypes(XSParticle parentParticle, MessageType messageType
 							allSubtitutables.addAll(subsumptionSubstitutables);
 
 							for (XSElementDecl substitutable : allSubtitutables) {
-								if (substitutable.isAbstract() || substitutable.getType().asComplexType().isAbstract()) {
+								if (substitutable.isAbstract()
+										|| (substitutable.getType().isComplexType() && substitutable.getType().asComplexType().isAbstract())) {
 									// No abstract concept in protobuf, only concrete messages
 								} else {
 									addOneOfField(messageType, schemaSet, fieldOptions, fieldLocation, oneOf, substitutable);