From 6d60d7075c9dd15e4734d34c46ee3b7dbf37d962 Mon Sep 17 00:00:00 2001 From: kobayasi Date: Sat, 23 Nov 2013 05:58:27 +0900 Subject: [PATCH] fix BufferedReader read bug. --- engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java | 5 ++++- engine/src/core/com/jme3/shader/plugins/GLSLLoader.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java b/engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java index 4575b76a8..c1a161170 100644 --- a/engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java +++ b/engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java @@ -62,8 +62,11 @@ public class BitmapFontLoader implements AssetLoader { String regex = "[\\s=]+"; font.setCharSet(charSet); - while (reader.ready()){ + while (true){ String line = reader.readLine(); + if (line == null) { + break; + } String[] tokens = line.split(regex); if (tokens[0].equals("info")){ // Get rendered size diff --git a/engine/src/core/com/jme3/shader/plugins/GLSLLoader.java b/engine/src/core/com/jme3/shader/plugins/GLSLLoader.java index 12f7a0069..d9113a286 100644 --- a/engine/src/core/com/jme3/shader/plugins/GLSLLoader.java +++ b/engine/src/core/com/jme3/shader/plugins/GLSLLoader.java @@ -101,8 +101,11 @@ public class GLSLLoader implements AssetLoader { StringBuilder sb = new StringBuilder(); BufferedReader r = new BufferedReader(new InputStreamReader(in)); - while (r.ready()){ + while (true){ String ln = r.readLine(); + if (ln == null) { + break; + } if (ln.startsWith("#import ")){ ln = ln.substring(8).trim(); if (ln.startsWith("\"") && ln.endsWith("\"") && ln.length() > 3){ -- 2.11.0