309402

1 files changed, 9 insertions, 1 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java b/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java
index d5568dc13..0905ff1c0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java
@@ -170,6 +170,8 @@ public class Main {
 	/** ReflectionFactory identifier for command (compiler) */
 	protected String commandName;
 
+	protected ICommand command;
+
 	/** client-set message sink */
 	private IMessageHolder clientHolder;
 
@@ -198,6 +200,10 @@ public class Main {
 		this.controller = controller;
 	}
 
+	public void setCommand(ICommand command) {
+		this.command = command;
+	}
+
 	/**
 	 * Run without throwing exceptions but optionally using System.exit(..). This sets up a message handler which emits messages
 	 * immediately, so report(boolean, IMessageHandler) only reports total number of errors or warnings.
@@ -346,7 +352,9 @@ public class Main {
 		if (0 < holder.numMessages(IMessage.ERROR, true)) {
 			return;
 		}
-		ICommand command = ReflectionFactory.makeCommand(commandName, holder);
+		if (command == null) {
+			command = ReflectionFactory.makeCommand(commandName, holder);
+		}
 		if (0 < holder.numMessages(IMessage.ERROR, true)) {
 			return;
 		}