From 5c446f1b622dff18db0cc46dfaf894c994d36016 Mon Sep 17 00:00:00 2001
From: wh0 <wh0@users.noreply.github.com>
Date: Sun, 15 Feb 2015 19:56:32 -0800
Subject: [PATCH] adjust UnicodeSupport.mergePairs logic

when we reach the end of one array, copy the rest of the other and return
---
 .../java/org/teavm/classlib/impl/unicode/UnicodeSupport.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeSupport.java b/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeSupport.java
index 225d6d2ae..296b99b0c 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeSupport.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/impl/unicode/UnicodeSupport.java
@@ -144,12 +144,12 @@ public class UnicodeSupport {
         int j = 0;
         int t = 0;
         while (true) {
-            if (i == a.length) {
+            if (j == b.length) {
                 while (i < a.length) {
                     result[t++] = a[i++];
                 }
                 break;
-            } else if (j == b.length) {
+            } else if (i == a.length) {
                 while (j < b.length) {
                     result[t++] = b[j++];
                 }