fix: catch NoClassDefFoundError when we try to import a class absent …

…from the classpath (#1974)
INRIA · Apr 24, 2018 · f3032be · f3032be
1 parent 13e769c
commit f3032be
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/spoon/reflect/visitor/ImportScannerImpl.java b/src/main/java/spoon/reflect/visitor/ImportScannerImpl.java
@@ -522,7 +522,7 @@ protected boolean classNamePresentInJavaLang(CtTypeReference<?> ref) {
 				try {
 					Class.forName("java.lang." + ref.getSimpleName());
 					presentInJavaLang = true;
-				} catch (ClassNotFoundException e) {
+				} catch (NoClassDefFoundError | ClassNotFoundException e) {
 					presentInJavaLang = false;
 				}
 			}

diff --git a/src/main/java/spoon/support/compiler/jdt/JDTImportBuilder.java b/src/main/java/spoon/support/compiler/jdt/JDTImportBuilder.java
@@ -118,7 +118,7 @@ private CtType getOrLoadClass(String className) {
 					Class zeClass = this.getClass().getClassLoader().loadClass(className);
 					klass = this.factory.Type().get(zeClass);
 					return klass;
-				} catch (ClassNotFoundException e) {
+				} catch (NoClassDefFoundError | ClassNotFoundException e) {
 					return null;
 				}
 			}

diff --git a/src/main/java/spoon/support/compiler/jdt/ReferenceBuilder.java b/src/main/java/spoon/support/compiler/jdt/ReferenceBuilder.java
@@ -988,7 +988,7 @@ void setPackageOrDeclaringType(CtTypeReference<?> ref, CtReference declaring) {
 				CtPackageReference javaLangPackageReference = this.jdtTreeBuilder.getFactory().Core().createPackageReference();
 				javaLangPackageReference.setSimpleName("java.lang");
 				ref.setPackage(javaLangPackageReference);
-			} catch (ClassNotFoundException e) {
+			} catch (NoClassDefFoundError | ClassNotFoundException e) {
 				// in that case we consider the package should be the same as the current one. Fix #1293
 				ref.setPackage(jdtTreeBuilder.getContextBuilder().compilationUnitSpoon.getDeclaredPackage().getReference());
 			}