Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java
index 6fcdc412e2b..5a15047793d 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java
@@ -263,10 +263,11 @@ public class JavaTextFileBuffer extends JavaFileBuffer implements ITextFileBuffe
IContentDescription description= Platform.getContentTypeManager().getDescriptionFor(stream, fFile.getName(), options);
if (description != null) {
fEncoding= description.getCharset();
-
- fUTF8BOM= (byte[]) description.getProperty(IContentDescription.BYTE_ORDER_MARK);
- if (fUTF8BOM != null && fUTF8BOM != IContentDescription.BOM_UTF_8)
- throw new CoreException(new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.getString("FileBuffer.error.wrongByteOrderMark"), null)); //$NON-NLS-1$
+ if (CHARSET_UTF_8.equals(fEncoding)) {
+ fUTF8BOM= (byte[]) description.getProperty(IContentDescription.BYTE_ORDER_MARK);
+ if (fUTF8BOM != null && fUTF8BOM != IContentDescription.BOM_UTF_8)
+ throw new CoreException(new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.getString("FileBuffer.error.wrongByteOrderMark"), null)); //$NON-NLS-1$
+ }
}
} catch (IOException e) {
fEncoding= null;

Back to the top