commit 91dab3f0ee376b102cb8fb9eb0fb356d1d0c3888
author Cezar Cristian Andrei <cezar@apache.org> Tue Feb 07 23:23:10 2012 +0000
committer Cezar Cristian Andrei <cezar@apache.org> Tue Feb 07 23:23:10 2012 +0000
tree ebc841bda495e1235ca9a5455b28c33e7357f76b
parent bb91c74ada0f90ac2cf9377ed983c453a948b24c

Fix NPE in SchemaTypeImpl.getEnumJavaClass().

Thanks to Martin McCallion for investigation.


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

src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java

diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java b/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
index 4bc816d..ec4a90d 100644
--- a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
+++ b/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
@@ -1831,10 +1831,17 @@
         // This field is declared volatile and Class is immutable so this is allowed.
         if (_javaEnumClass == null)
         {
-            try
-                { _javaEnumClass = Class.forName(getBaseEnumType().getFullJavaName() + "$Enum", false, getTypeSystem().getClassLoader()); }
-            catch (ClassNotFoundException e)
-                { _javaEnumClass = null; }
+            if ( getBaseEnumType() != null )
+            {
+                try
+                {
+                    _javaEnumClass = Class.forName(getBaseEnumType().getFullJavaName() + "$Enum", false, getTypeSystem().getClassLoader());
+                }
+                catch (ClassNotFoundException e)
+                { 
+                    _javaEnumClass = null;
+                }
+            }
         }
 
         return _javaEnumClass;