# HG changeset patch
# User Andrew John Hughes <gnu.andrew@redhat.com>
# Date 1366128706 -3600
# Node ID 6660c8ee4785bd0d5abbdb00bd67ca37859a73ba
# Parent  8743805e76dda47c2e2604145afcee4626f11e5f
PR1339: Simplify the rewriter, avoiding concurrency.

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

	PR1339: Simplify the rewriter, avoiding concurrency.
	* rewriter/com/redhat/rewriter/ClassRewriter.java:
	Always use the single threaded executor.
	* NEWS: Updated with this and previous fix.

diff -r 8743805e76dd -r 6660c8ee4785 ChangeLog
--- a/ChangeLog	Tue Apr 16 17:08:54 2013 +0100
+++ b/ChangeLog	Tue Apr 16 17:11:46 2013 +0100
@@ -1,3 +1,10 @@
+2013-03-11  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1339: Simplify the rewriter, avoiding concurrency.
+	* rewriter/com/redhat/rewriter/ClassRewriter.java:
+	Always use the single threaded executor.
+	* NEWS: Updated with this and previous fix.
+
 2013-04-16  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR1338: Remove dependence on libXp
diff -r 8743805e76dd -r 6660c8ee4785 NEWS
--- a/NEWS	Tue Apr 16 17:08:54 2013 +0100
+++ b/NEWS	Tue Apr 16 17:11:46 2013 +0100
@@ -58,6 +58,8 @@
 * Bug fixes
   - Fix get_stack_bounds memory leak (alternate fix for S7197906)
   - PR1362: Fedora 19 / rawhide FTBFS SIGILL
+  - PR1338: Remove dependence on libXp
+  - PR1339: Simplify the rhino class rewriter to avoid use of concurrency
 
 New in release 1.12.4 (2013-03-04):
 
diff -r 8743805e76dd -r 6660c8ee4785 rewriter/com/redhat/rewriter/ClassRewriter.java
--- a/rewriter/com/redhat/rewriter/ClassRewriter.java	Tue Apr 16 17:08:54 2013 +0100
+++ b/rewriter/com/redhat/rewriter/ClassRewriter.java	Tue Apr 16 17:11:46 2013 +0100
@@ -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
+}