Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2019-01-22 12:35:38 -0500
committerStephan Herrmann2019-01-22 12:36:37 -0500
commitbc8d9862a386d3a2496bffc65c99d8483afd7966 (patch)
tree207f315c84549e2c64e6fa5de7335bda020a3f51
parent51aa969ecc1d0045248f76561f2d92330fc6bc27 (diff)
downloadeclipse.jdt.core-bc8d9862a386d3a2496bffc65c99d8483afd7966.tar.gz
eclipse.jdt.core-bc8d9862a386d3a2496bffc65c99d8483afd7966.tar.xz
eclipse.jdt.core-bc8d9862a386d3a2496bffc65c99d8483afd7966.zip
Bug 532145 - [9] NullPointerException when run with JRE 9
-rw-r--r--org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java8
-rw-r--r--org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java8
2 files changed, 10 insertions, 6 deletions
diff --git a/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java b/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java
index b51cb094af..030258c7ef 100644
--- a/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java
+++ b/org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2018 IBM Corporation and others.
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -934,8 +934,10 @@ public class EclipseFileManager implements StandardJavaFileManager {
for (Iterator<? extends File> iterator = iterable2.iterator(); iterator.hasNext(); ) {
list.add(iterator.next());
}
- for (Iterator<? extends File> iterator = iterable.iterator(); iterator.hasNext(); ) {
- list.add(iterator.next());
+ if (iterable != null) {
+ for (Iterator<? extends File> iterator = iterable.iterator(); iterator.hasNext(); ) {
+ list.add(iterator.next());
+ }
}
return list;
}
diff --git a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java
index 37d9e294ef..05fcedbc18 100644
--- a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java
+++ b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2018 IBM Corporation and others.
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -959,8 +959,10 @@ public class EclipseFileManager implements StandardJavaFileManager {
for (Iterator<? extends File> iterator = iterable2.iterator(); iterator.hasNext(); ) {
list.add(iterator.next());
}
- for (Iterator<? extends File> iterator = iterable.iterator(); iterator.hasNext(); ) {
- list.add(iterator.next());
+ if (iterable != null) {
+ for (Iterator<? extends File> iterator = iterable.iterator(); iterator.hasNext(); ) {
+ list.add(iterator.next());
+ }
}
return list;
}

Back to the top