# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1363019436 0
# Node ID ac2e6d3acc008a80168aaa56dc2cd03d219af51f
# Parent  1bcc6dd061faaf446d78c829b481227782934479
PR1340: Simplify the rhino class rewriter to avoid use of concurrency

2013-03-11  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	PR1340: Simplify the rewriter, avoiding concurrency.
	* NEWS: Mention fix.
	* rewriter/com/redhat/rewriter/ClassRewriter.java:
	Always use the single threaded executor.

diff -r 1bcc6dd061fa -r ac2e6d3acc00 ChangeLog
--- a/ChangeLog	Mon Mar 11 16:24:59 2013 +0000
+++ b/ChangeLog	Mon Mar 11 16:30:36 2013 +0000
@@ -1,3 +1,10 @@
+2013-03-11  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1340: Simplify the rewriter, avoiding concurrency.
+	* NEWS: Mention fix.
+	* rewriter/com/redhat/rewriter/ClassRewriter.java:
+	Always use the single threaded executor.
+
 2013-03-11  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am:
diff -r 1bcc6dd061fa -r ac2e6d3acc00 NEWS
--- a/NEWS	Mon Mar 11 16:24:59 2013 +0000
+++ b/NEWS	Mon Mar 11 16:30:36 2013 +0000
@@ -23,6 +23,7 @@
 * Bug fixes
   - PR1303: Correct #ifdef to #if
   - Stop libraries being stripped in the OpenJDK build.
+  - PR1340: Simplify the rhino class rewriter to avoid use of concurrency
 
 New in release 2.1.6 (2013-02-20):
 
diff -r 1bcc6dd061fa -r ac2e6d3acc00 rewriter/com/redhat/rewriter/ClassRewriter.java
--- a/rewriter/com/redhat/rewriter/ClassRewriter.java	Mon Mar 11 16:24:59 2013 +0000
+++ b/rewriter/com/redhat/rewriter/ClassRewriter.java	Mon Mar 11 16:30:36 2013 +0000
@@ -60,8 +60,8 @@
   /**
    * The executor for submitting rewriting jobs.
    */
-  private static final ExecutorService executor = DEBUG ?
-    Executors.newSingleThreadExecutor() : Executors.newCachedThreadPool();
+  private static final ExecutorService executor = 
+    Executors.newSingleThreadExecutor();
 
   /**
    * The source directory, set once by main.
@@ -290,4 +290,4 @@
     return null;
   }
 
-}
\ No newline at end of file
+}