From c2db96edc81568c7f5bfd1933662fbcb21ba6f6e Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 6 Aug 2012 15:57:35 +0200 Subject: [PATCH] Just don't use nio, this might be slower. --- .../earth2me/essentials/EssentialsConf.java | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java index c1c7d0a58..0440febce 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java @@ -39,6 +39,7 @@ public class EssentialsConf extends YamlConfiguration super(); this.configFile = configFile; } + private final byte[] bytebuffer = new byte[1024]; public synchronized void load() { @@ -117,27 +118,11 @@ public class EssentialsConf extends YamlConfiguration try { final ByteBuffer buffer = ByteBuffer.allocate((int)configFile.length()); - int retry = 0; - do + int length; + while ((length = inputStream.read(bytebuffer)) != -1) { - final FileChannel channel = inputStream.getChannel(); - channel.position(0); - try - { - channel.read(buffer); - retry = 0; - } - catch (ClosedByInterruptException ex) - { - buffer.rewind(); - retry++; - if (retry >= 5) - { - throw ex; - } - } + buffer.put(bytebuffer, 0, length); } - while (retry > 0); buffer.rewind(); final CharBuffer data = CharBuffer.allocate((int)configFile.length()); CharsetDecoder decoder = UTF8.newDecoder();