Fix for bug 367669 - Removing the trouble shooting logs

3 files changed, 36 insertions, 45 deletions

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java
index 7081abca38..e20698a8df 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java
@@ -2788,6 +2788,7 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
 	}
 	public void setUpSuite() throws Exception {
 		super.setUpSuite();
+
 		// ensure autobuilding is turned off
 		IWorkspaceDescription description = getWorkspace().getDescription();
 		if (description.isAutoBuilding()) {
@@ -2797,7 +2798,7 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
 	}
 	protected void setUp () throws Exception {
 		super.setUp();
-		System.setProperty("jdt.bug.367669", "non-null");
+
 		if (NameLookup.VERBOSE || BasicSearchEngine.VERBOSE || JavaModelManager.VERBOSE) {
 			System.out.println("--------------------------------------------------------------------------------");
 			System.out.println("Running test "+getName()+"...");
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachSourceTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachSourceTests.java
index 82c0dc8cf1..35fa5c48d7 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachSourceTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachSourceTests.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jdt.core.tests.model;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -50,6 +51,7 @@ import org.eclipse.jdt.core.dom.ASTParser;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.core.ExternalFoldersManager;
 import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
+import org.eclipse.jdt.internal.core.JavaModelManager;
 import org.eclipse.jdt.internal.core.JavaProject;
 import org.eclipse.jdt.internal.core.util.Util;
 
@@ -504,7 +506,33 @@ public void testExternalFolder5() throws Exception {
 
 		String externalLib = externalFolder + "/lib";
 		IJavaProject javaProject = null;
-		javaProject = createJavaProject("P", new String[0], new String[] {externalLib}, "");
+		try {
+			javaProject = createJavaProject("P", new String[0], new String[] {externalLib}, "");
+		}
+		catch (Exception e) {
+			IFolder folder = getFolder(externalLib);
+			System.out.println("----------  This information is logged for debugging purposes as this test fails sporadically.---------");
+			System.out.println("Failing when creating Link folder for: " + externalFolder);
+			System.out.println("Existing? " + folder.exists());
+			IProject externalFolderProject = JavaModelManager.getExternalManager().getExternalFoldersProject();
+			IFile externalProjectFile = externalFolderProject.getFile(".project");
+			if (externalProjectFile.exists()) {
+				System.out.println("External Folder Project exists with following content:");
+				BufferedInputStream bs = new BufferedInputStream(externalProjectFile.getContents());
+				int available = 0;
+				while ((available = bs.available()) > 0) {
+					byte[] contents = new byte[available];
+					bs.read(contents);
+					System.out.println(new String(contents));
+				}
+				bs.close();
+			}
+			else {
+				System.out.println("External folders project doesn't exist.");
+			}
+			System.out.println("----------  Debug information ends ---------");
+			throw e;
+		}
 		IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(externalLib);
 		attachSource(root, externalFolder + "/src228639", "");
 		IType type = root.getPackageFragment("p").getClassFile("X.class").getType();
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
index 4dde5e315f..6b86780ec9 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core;
 
-import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -25,7 +24,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
@@ -161,46 +159,10 @@ public class ExternalFoldersManager {
 									IProject externalFoldersProject, IProgressMonitor monitor) throws CoreException {
 		
 		IFolder result = addFolder(externalFolderPath, externalFoldersProject, false);
-		try {
-			if (!result.exists())
-				result.createLink(externalFolderPath, IResource.ALLOW_MISSING_LOCAL, monitor);
-			else if (refreshIfExistAlready)
-				result.refreshLocal(IResource.DEPTH_INFINITE,  monitor);
-		}
-		catch(IllegalArgumentException e) {
-			if (System.getProperty("jdt.bug.367669") != null) { //$NON-NLS-1$
-				System.out.println("============================================================================================================"); //$NON-NLS-1$
-				System.out.println("The following logs are created for troubleshooting bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=367669"); //$NON-NLS-1$
-				System.out.println("Exteral folder: " + externalFolderPath); //$NON-NLS-1$
-				System.out.println("Link folder: " + result.toString()); //$NON-NLS-1$
-				File externalFile = new File(externalFolderPath.toOSString());
-				System.out.println(externalFile.exists() ? "External folder exists" : "ERROR: External folder DOES NOT exist"); //$NON-NLS-1$ //$NON-NLS-2$
-				System.out.println(result.exists() ? "Link for folder exists" : "ERROR: Link for folder does not exist");  //$NON-NLS-1$//$NON-NLS-2$
-				IProject externalFolderProject = getExternalFoldersProject();
-				IFile externalProjectFile = externalFolderProject.getFile(IProjectDescription.DESCRIPTION_FILE_NAME);
-				if (externalProjectFile.exists()) {
-					System.out.println("External Folder Project exists with following content:"); //$NON-NLS-1$
-					BufferedInputStream bs = new BufferedInputStream(externalProjectFile.getContents());
-					int available = 0;
-					try {
-						while ((available = bs.available()) > 0) {
-							byte[] contents = new byte[available];
-							bs.read(contents);
-							System.out.println(new String(contents));
-						}
-						bs.close();
-					} catch (IOException e1) {
-						System.out.println("Error reading external folder project file: Here is the stack trace:"); //$NON-NLS-1$
-						e1.printStackTrace();
-					}
-				}
-				else {
-					System.out.println("ERROR: External folders project doesn't exist."); //$NON-NLS-1$
-				}
-				System.out.println("========================================== Debug information ends =========================================="); //$NON-NLS-1$
-			}
-			throw e;
-		}
+		if (!result.exists())
+			result.createLink(externalFolderPath, IResource.ALLOW_MISSING_LOCAL, monitor);
+		else if (refreshIfExistAlready)
+			result.refreshLocal(IResource.DEPTH_INFINITE,  monitor);
 		return result;
 	}