ICU-6867 Merged c25941(#6891), c25943(#6892) and c25945(#6893) from trunk to maint-4-2.

X-SVN-Rev: 25948

.gitattributes

@@ -53,7 +53,6 @@ README text !eol
 /eclipseFragment.txt -text
 eclipseProjectMisc/initSrc.launch -text
 eclipseProjectMisc/normSrc.launch -text
-/ee.foundation.jar -text
 localespi/.classpath -text
 localespi/.externalToolBuilders/localespi_jar.launch -text
 localespi/.project -text

ee.foundation.jar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f730fd4a8ca71fcddc61a4f62490cea7805efffc7eb2b8669942f6d123f7249
-size 1059077

src/com/ibm/icu/charset/CharsetMBCS.java

@@ -1913,7 +1913,7 @@ class CharsetMBCS extends CharsetICU {
             /* try to match */
             match = matchToU((byte) -1, source.array(), source.position(), source.limit(), null, value, useFallback, true);
 
-            if (match == source.limit()) {
+            if (match == (source.limit() - source.position())) {
                 /* write result for simple, single-character conversion */
                 if (TO_U_IS_CODE_POINT(value[0])) {
                     return TO_U_GET_CODE_POINT(value[0]);

src/com/ibm/icu/dev/data/testdata.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e349c092d556fd26fef762b3d1d208e36f25200bce3e53a2235d0aa64b3ac919
-size 771979
+oid sha256:553d640303f02b4a9934c1a68c47bd736eff433659c1c7962a2439b869fdb43b
+size 774992

src/com/ibm/icu/impl/data/icudata.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0eacf1a2c8bda17e9b9cb13919a4bfc0a6f36a403cc91232016da21477e41df5
-size 7214616
+oid sha256:2e1e7200710a9e8f3aa915be53461938c75460b93537ad85a892cfcb179dcb44
+size 7214653