fix(factory): Handles null parameter in Type#createReference(Class) a…

…nd isSubTypeOf. (Closes #825)
INRIA · Sep 21, 2016 · 7214144 · 7214144
1 parent e8c1073
commit 7214144
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/spoon/reflect/factory/TypeFactory.java b/src/main/java/spoon/reflect/factory/TypeFactory.java
@@ -293,6 +293,9 @@ public <T> CtArrayTypeReference<T> createArrayReference(String qualifiedName) {
  * Creates a reference to a simple type
  */
  public <T> CtTypeReference<T> createReference(Class<T> type) {
+ if (type == null) {
+ return null;
+ }
  if (type.isArray()) {
  CtArrayTypeReference<T> array = factory.Core().createArrayTypeReference();
  array.setComponentType(createReference(type.getComponentType()));

diff --git a/src/main/java/spoon/support/reflect/reference/CtTypeReferenceImpl.java b/src/main/java/spoon/support/reflect/reference/CtTypeReferenceImpl.java
@@ -257,11 +257,7 @@ public boolean isSubtypeOf(CtTypeReference<?> type) {
  }
  }
  CtTypeReference<?> superType = getFactory().Type().createReference(actualSubType.getSuperclass());
- if (superType.equals(type)) {
- return true;
- } else {
- return superType.isSubtypeOf(type);
- }
+ return superType != null && (superType.equals(type) || superType.isSubtypeOf(type));
  } catch (Exception e) {
  Launcher.LOGGER.error("cannot determine runtime types for '" + this + "' and '" + type + "'", e);
  return false;

diff --git a/src/test/java/spoon/test/reference/TypeReferenceTest.java b/src/test/java/spoon/test/reference/TypeReferenceTest.java
@@ -546,4 +546,15 @@ public void testImproveAPIActualTypeReference() throws Exception {
 
  assertEquals(1, typeReference.getActualTypeArguments().size());
  }
+
+ @Test
+ public void testIsSubTypeSuperClassNull() throws Exception {
+ Factory factory = createFactory();
+
+ factory.Class().create("Tacos");
+ CtTypeReference<?> subRef = factory.Type().createReference(AutoCloseable.class);
+ CtTypeReference<?> superRef = factory.Type().createReference("Tacos");
+
+ assertFalse(subRef.isSubtypeOf(superRef));
+ }
 }