Upgrade ICU4J.

[Dictionary.git] / jars / icu4j-52_1 / main / classes / core / src / com / ibm / icu / impl / data / ResourceReader.java

diff --git a/jars/icu4j-4_8_1_1/main/classes/core/src/com/ibm/icu/impl/data/ResourceReader.java b/jars/icu4j-52_1/main/classes/core/src/com/ibm/icu/impl/data/ResourceReader.java
similarity index 97%
rename from jars/icu4j-4_8_1_1/main/classes/core/src/com/ibm/icu/impl/data/ResourceReader.java
rename to jars/icu4j-52_1/main/classes/core/src/com/ibm/icu/impl/data/ResourceReader.java
index fb19bca01a65e479c85bb45df9df483e2b4fb887..cb7075b4e4c38c8c548c69e227da97acaa855217 100644 (file)
--- a/jars/icu4j-4_8_1_1/main/classes/core/src/com/ibm/icu/impl/data/ResourceReader.java
+++ b/jars/icu4j-52_1/main/classes/core/src/com/ibm/icu/impl/data/ResourceReader.java
@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
- * Copyright (C) 2001-2011, International Business Machines Corporation and    *
+ * Copyright (C) 2001-2013, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -144,8 +144,8 @@ public class ResourceReader {
             // Remove BOMs
             ++lineNo;
             String line = reader.readLine();
-            if (line.charAt(0) == '\uFFEF' ||
-                line.charAt(0) == '\uFEFF') {
+            if (line != null && (line.charAt(0) == '\uFFEF' ||
+                                 line.charAt(0) == '\uFEFF')) {
                 line = line.substring(1);
             }
             return line;