HEAD - Fix null cases

1 files changed, 12 insertions, 7 deletions

diff --git a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java
index bd42934845..14fc466a43 100644
--- a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java
+++ b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java
@@ -283,17 +283,22 @@ public class EclipseCompiler extends Main implements JavaCompiler {
 		}
 		this.compilationUnits = compilationUnits;
 		this.diagnosticListener = diagnosticListener;
-		this.fileManager = fileManager;
+		if (fileManager != null) {
+			this.fileManager = fileManager;
+		} else {
+			this.fileManager = this.getStandardFileManager(diagnosticListener, null, null);
+		}
 
 		this.initialize(writerOut, writerErr, false);
 
-		for (Iterator<String> iterator = options.iterator(); iterator.hasNext(); ) {
-			fileManager.handleOption(iterator.next(), iterator);
-		}
-		
 		ArrayList<String> allOptions = new ArrayList<String>();
-		for (String option : options) {
-			allOptions.add(option);
+		if (options != null) {
+    		for (Iterator<String> iterator = options.iterator(); iterator.hasNext(); ) {
+    			this.fileManager.handleOption(iterator.next(), iterator);
+    		}
+    		for (String option : options) {
+    			allOptions.add(option);
+    		}
 		}
 
 		if (compilationUnits != null) {