Version 15.2, November 2013

[GpsPrune.git] / tim / prune / load / FileCacher.java

diff --git a/tim/prune/load/FileCacher.java b/tim/prune/load/FileCacher.java
index de1e7caea8d6b2bd909943f6ad59f34661815096..22383c6acb544f6f7e754f50e8b98eae1d645120 100644 (file)
--- a/tim/prune/load/FileCacher.java
+++ b/tim/prune/load/FileCacher.java
@@ -12,7 +12,9 @@ import java.util.ArrayList;
  */
 public class FileCacher
 {
+       /** File to cache */
        private File _file = null;
+       /** Array to hold lines of file */
        private String[] _contentArray = null;
 
 
@@ -40,8 +42,16 @@ public class FileCacher
                        {
                                reader = new BufferedReader(new FileReader(_file));
                                String currLine = reader.readLine();
+                               if (currLine != null && currLine.startsWith("<?xml")) {
+                                       return; // it's an xml file, it shouldn't use this cacher
+                               }
                                while (currLine != null)
                                {
+                                       if (currLine.indexOf('\0') >= 0)
+                                       {
+                                               try {reader.close();} catch (IOException ioe2) {}
+                                               return; // it's a binary file, shouldn't use this cacher
+                                       }
                                        if (currLine.trim().length() > 0)
                                                contentList.add(currLine);
                                        currLine = reader.readLine();