diff options
| author | Dani Megert | 2012-04-24 13:40:40 +0000 |
|---|---|---|
| committer | Dani Megert | 2012-04-24 13:40:40 +0000 |
| commit | 523e872119d2744ba7e02691f54bfbfa15a6e0e5 (patch) | |
| tree | 6edc0892d4e8dfc0e62de636e333be2a4a725311 | |
| parent | b0dfba155489bb89ceb735d37809b3fa858c2220 (diff) | |
| download | eclipse.platform.text-523e872119d2744ba7e02691f54bfbfa15a6e0e5.tar.gz eclipse.platform.text-523e872119d2744ba7e02691f54bfbfa15a6e0e5.tar.xz eclipse.platform.text-523e872119d2744ba7e02691f54bfbfa15a6e0e5.zip | |
getEncoding() must not return 'null'v20120424-1340I20120426-1030I20120426-1000I20120426-0800
| -rw-r--r-- | org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java index 00025c6069a..66ecb307e70 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 IBM Corporation and others. + * Copyright (c) 2007, 2012 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 @@ -405,6 +405,11 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex FileBuffersPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.JavaTextFileBuffer_error_closeStream, ex)); } } + + // Use global default + if (fEncoding == null) + fEncoding= fManager.getDefaultEncoding(); + } /* |