diff options
| author |  Matthew DeVore <matvore@google.com> | 2015-09-08 17:42:27 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-09-08 22:27:45 +0000 |
| commit | 475a1344e16337d053dbb5d8a48379cd87bea042 (patch) | |
| tree | d9b642e4d99581f101e7ce28734ddc5444125a80 /src/objc_tools | |
| parent | 79e40acafe09bc7cbb09556fd6d6b389d5b77d5c (diff) | |
RELNOTES: Support empty plist files
--
MOS_MIGRATED_REVID=102570037
Diffstat (limited to 'src/objc_tools')
| -rw-r--r-- | src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java index f9f20bf00b..e505a0d087 100644 --- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java +++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java @@ -302,7 +302,6 @@ public class PlistMerging extends Value<PlistMerging> { byte[] buffer = new byte[UTF8_BOM.length]; int read = stream.read(buffer); stream.reset(); - buffer = Arrays.copyOf(buffer, read); if (UTF8_BOM.length == read && Arrays.equals(buffer, UTF8_BOM)) { stream.skip(UTF8_BOM.length); |