Issue #23.

Author: highsource

tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java

@@ -120,7 +120,7 @@ public boolean isAbstract() {
 	}
 
 	protected MClassRef<NType, NClass> createClassRef(Class<?> _class) {
-		return new CMClassRef<NType, NClass>(getClazz(_class),
+		return new CMClassRef<NType, NClass>(getClazz(_class), _class,
 				getPackage(_class), getContainer(_class), getLocalName(_class));
 	}
 
@@ -137,8 +137,9 @@ protected MClassRef<NType, NClass> getTypeInfo(CClassRef info) {
 	}
 
 	protected MClassRef<NType, NClass> createClassRef(CClassRef info) {
-		return new CMClassRef<NType, NClass>(getClazz(info), getPackage(info),
-				getContainer(info), getLocalName(info));
+		final NClass targetType = getClazz(info);
+		return new CMClassRef<NType, NClass>(targetType, loadClass(targetType),
+				getPackage(info), getContainer(info), getLocalName(info));
 	}
 
 	@Override
@@ -391,4 +392,14 @@ protected MClassTypeInfo<NType, NClass> createBaseTypeInfo(CClassInfo info) {
 			return null;
 		}
 	}
+
+	@Override
+	protected Class<?> loadClass(NType referencedType) {
+		final String name = referencedType.fullName();
+		try {
+			return Class.forName(name);
+		} catch (ClassNotFoundException cnfex) {
+			return null;
+		}
+	}
 }