check for unknown types

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@481381 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 1 deletions

diff --git a/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java b/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
index 4c168cd036..bd83e85090 100644
--- a/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
@@ -356,7 +356,11 @@ public class JavaGenerator extends Generator
 		String domainType = globalDomainMap.getDomainType(domainName, version);
 		if (domainType == null)
 			throw new AmqpTypeMappingException("Domain type \"" + domainName + "\" not found in Java typemap.");
-		return typeMap.get(domainType).type;
+                DomainInfo info = typeMap.get(domainType);
+                if (info == null) {
+                    throw new AmqpTypeMappingException("Unknown type: \"" + domainType + "\"");
+                }
+		return info.type;
 	}