OSDN Git Service

fix BufferedReader read bug.
authorkobayasi <kobayasi@pscnet.co.jp>
Fri, 22 Nov 2013 20:58:27 +0000 (05:58 +0900)
committerkobayasi <kobayasi@pscnet.co.jp>
Fri, 22 Nov 2013 20:58:27 +0000 (05:58 +0900)
engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java
engine/src/core/com/jme3/shader/plugins/GLSLLoader.java

index 4575b76..c1a1611 100644 (file)
@@ -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
index 12f7a00..d9113a2 100644 (file)
@@ -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){