Fixed bug that building projects with both JavaBuilder and Java2Script builder may lock eclipse on building forever.

zhourenjian@gmail.com · zhourenjian@gmail.com · commit 494e16ed078f · 2013-06-21T16:13:08.000Z
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java
@@ -41,6 +41,7 @@ public class Java2ScriptCompiler implements IExtendedCompiler {
 
 	public void process(ICompilationUnit sourceUnit, IContainer binaryFolder) {
 		final IProject project = binaryFolder.getProject();
+		/*
 		synchronized (project) {
 			if (Java2ScriptProjectNature.hasJavaBuilder(project)) {
 				if (Java2ScriptProjectNature.removeJavaBuilder(project)) {
@@ -62,6 +63,7 @@ public void run() {
 				}
 			}
 		}
+		// */
 		String prjFolder = project.getLocation().toOSString();
 		File file = new File(prjFolder, ".j2s"); //$NON-NLS-1$
 		if (!file.exists()) {

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public class Java2ScriptCompiler implements IExtendedCompiler {`
`41`	`41`
`42`	`42`	`public void process(ICompilationUnit sourceUnit, IContainer binaryFolder) {`
`43`	`43`	`final IProject project = binaryFolder.getProject();`
	`44`	`+ /*`
`44`	`45`	`synchronized (project) {`
`45`	`46`	`if (Java2ScriptProjectNature.hasJavaBuilder(project)) {`
`46`	`47`	`if (Java2ScriptProjectNature.removeJavaBuilder(project)) {`
`@@ -62,6 +63,7 @@ public void run() {`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`	`}`
	`66`	`+ // */`
`65`	`67`	`String prjFolder = project.getLocation().toOSString();`
`66`	`68`	`File file = new File(prjFolder, ".j2s"); //$NON-NLS-1$`
`67`	`69`	`if (!file.exists()) {`