From 79c73a3538d3a4f243fd6f2be982da64e960011b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 25 Dec 2012 13:49:24 +0400 Subject: [PATCH] suspicious byte-to-string conversion using default encoding --- .../openapi/components/impl/stores/StorageUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java index c4bdc5fc033d..dc264fd7c218 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java @@ -114,9 +114,9 @@ public class StorageUtil { final Ref refIOException = Ref.create(null); final Pair pair = loadFile(LocalFileSystem.getInstance().findFileByIoFile(file)); - final byte[] text = JDOMUtil.writeParent(element, pair.second).getBytes(CharsetToolkit.UTF8); + final String text = JDOMUtil.writeParent(element, pair.second); if (file.exists()) { - if (new String(text).equals(pair.first)) return null; + if (text.equals(pair.first)) return null; IFile backupFile = deleteBackup(filePath); file.renameTo(backupFile); } @@ -131,7 +131,8 @@ public class StorageUtil { try { final VirtualFile virtualFile = getOrCreateVirtualFile(requestor, file); - virtualFile.setBinaryContent(text, -1, -1, requestor); + byte[] bytes = text.getBytes(CharsetToolkit.UTF8); + virtualFile.setBinaryContent(bytes, -1, -1, requestor); result[0] = virtualFile; } catch (IOException e) {