commit 3d72507583ec6210c44e88eafd429a9786483cbb
author Ed Merks <ed.merks@gmail.com> Mon Apr 23 12:06:23 2012 +0200
committer Ed Merks <ed.merks@gmail.com> Mon Apr 23 12:06:23 2012 +0200
tree 860a67846f5d341f5c4ac829448b6bb74fa6545b
parent 4659a9f7fb926989ab70c5f63fb8e7901db431f5

[377376] Guard default value transformation for primitive type being
null.

plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java

diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java
index 544debf..b27144e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java
@@ -284,8 +284,9 @@
   protected String transformDefaultValue(XSDSimpleTypeDefinition xsdSimpleTypeDefinition, String defaultValue)
   {
     XSDSimpleTypeDefinition primitiveTypeDefinition = xsdSimpleTypeDefinition.getPrimitiveTypeDefinition();
-    if (primitiveTypeDefinition.hasNameAndTargetNamespace("float", defaultXMLSchemaNamespace) ||
-          primitiveTypeDefinition.hasNameAndTargetNamespace("double", defaultXMLSchemaNamespace))
+    if (primitiveTypeDefinition != null && 
+          (primitiveTypeDefinition.hasNameAndTargetNamespace("float", defaultXMLSchemaNamespace) ||
+             primitiveTypeDefinition.hasNameAndTargetNamespace("double", defaultXMLSchemaNamespace)))
     {
       if ("Infinity".equals(defaultValue))
       {