From 374521ee14c3e86a5722b417394be809ac6dc722 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 27 Feb 2009 20:00:33 +0000
Subject: [PATCH] dont turn off multithreaded context unless running command
 line build

---
 .../internal/core/builder/AjBuildManager.java     |  2 +-
 .../src/org/aspectj/tools/ajc/Main.java           | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 5b39e2178..7de5dc891 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -115,7 +115,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 	public static AsmHierarchyBuilder asmHierarchyBuilder = new AsmHierarchyBuilder();
 
 	static {
-		CompilationAndWeavingContext.setMultiThreaded(false);
+		// CompilationAndWeavingContext.setMultiThreaded(false);
 		CompilationAndWeavingContext.registerFormatter(CompilationAndWeavingContext.BATCH_BUILD, new AjBuildContexFormatter());
 		CompilationAndWeavingContext
 				.registerFormatter(CompilationAndWeavingContext.INCREMENTAL_BUILD, new AjBuildContexFormatter());
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 effb8f8b8..d5568dc13 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
@@ -185,6 +185,7 @@ public class Main {
 	public Main() {
 		controller = new CommandController();
 		commandName = ReflectionFactory.ECLIPSE;
+		CompilationAndWeavingContext.setMultiThreaded(false);
 		ourHandler = new MessageHandler(true);
 	}
 
@@ -292,15 +293,17 @@ public class Main {
 	/**
 	 * Run without using System.exit(..), putting all messages in holder:
 	 * <ul>
-	 * <li>ERROR: compiler error</li> <li>WARNING: compiler warning</li> <li>FAIL: command error (bad arguments, exception thrown)
-	 * </li>
+	 * <li>ERROR: compiler error</li>
+	 * <li>WARNING: compiler warning</li>
+	 * <li>FAIL: command error (bad arguments, exception thrown)</li>
 	 * </ul>
 	 * This handles incremental behavior:
 	 * <ul>
-	 * <li>If args include "-incremental", repeat for every input char until 'q' is entered.<li> <li>If args include
-	 * "-incrementalTagFile {file}", repeat every time we detect that {file} modification time has changed. </li> <li>Either way,
-	 * list files recompiled each time if args includes "-verbose".</li> <li>Exit when the commmand/compiler throws any Throwable.
-	 * </li>
+	 * <li>If args include "-incremental", repeat for every input char until 'q' is entered.
+	 * <li>
+	 * <li>If args include "-incrementalTagFile {file}", repeat every time we detect that {file} modification time has changed.</li>
+	 * <li>Either way, list files recompiled each time if args includes "-verbose".</li>
+	 * <li>Exit when the commmand/compiler throws any Throwable.</li>
 	 * </ul>
 	 * When complete, this contains all the messages of the final run of the command and/or any FAIL messages produced in running
 	 * the command, including any Throwable thrown by the command itself.
-- 
2.39.5