diff options
| author | Manoj Palat | 2019-02-05 09:16:01 +0000 |
|---|---|---|
| committer | Manoj Palat | 2019-02-05 09:16:01 +0000 |
| commit | bea7ce71afb7673b638922f4f0689b6bcdc614cf (patch) | |
| tree | 2956e2e36d420b34494449fdfb8f905fd4744c32 /org.eclipse.jdt.compiler.tool | |
| parent | 3d00de0bddc2b0d1c6a82db101dc7fdf733db143 (diff) | |
| parent | 705bf0beff6f458ef068964094f5fecf359aec3c (diff) | |
| download | eclipse.jdt.core-bea7ce71afb7673b638922f4f0689b6bcdc614cf.tar.gz eclipse.jdt.core-bea7ce71afb7673b638922f4f0689b6bcdc614cf.tar.xz eclipse.jdt.core-bea7ce71afb7673b638922f4f0689b6bcdc614cf.zip | |
Merge branch 'master' into BETA_JAVA_12
Diffstat (limited to 'org.eclipse.jdt.compiler.tool')
| -rw-r--r-- | org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java | 8 |
1 files changed, 5 insertions, 3 deletions
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 8bd79d34b0..05b2908229 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; } |