Attachment 82185 Details for Bug 208807 – Proposed patch

[patch] Proposed patch

v00.txt (text/plain), 1.34 KB, created by Frederic Fusier

on 2007-11-06 05:59:32 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2007-11-06 05:59:32 EST

Size: 1.34 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/core/JavaCore.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
>retrieving revision 1.590
>diff -u -r1.590 JavaCore.java
>--- model/org/eclipse/jdt/core/JavaCore.java	27 Oct 2007 07:33:35 -0000	1.590
>+++ model/org/eclipse/jdt/core/JavaCore.java	6 Nov 2007 09:20:19 -0000
>@@ -2889,14 +2889,14 @@
> 	 * @since 3.0
> 	 */
> 	public static String getEncoding() {
>-		// Verify that workspace is not shutting down (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=60687)
>-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
>-		if (workspace != null) {
>-			try {
>-				return workspace.getRoot().getDefaultCharset();
>-			} catch (CoreException e) {
>-				// fails silently and return plugin global encoding if core exception occurs
>-			}
>+		try {
>+			return ResourcesPlugin.getWorkspace().getRoot().getDefaultCharset();
>+		}
>+		catch (IllegalStateException ise) {
>+			// Happen when the workspace is shutting down (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=60687)
>+		}
>+		catch (CoreException ce) {
>+			// fails silently and return plugin global encoding if core exception occurs
> 		}
> 		return ResourcesPlugin.getEncoding();
> 	}

Actions: View | Diff

Attachments on bug 208807: 82185