summaryrefslogtreecommitdiff
path: root/icu4j
diff options
context:
space:
mode:
authorFredrik Roubert <roubert@google.com>2015-01-23 21:30:02 +0100
committerFredrik Roubert <roubert@google.com>2015-10-02 12:35:49 +0200
commite25a54101b72d27b345934e1574aa314c1899969 (patch)
treee03166bdbd4bfcf4990d03f14e87c32a0d7dfa5e /icu4j
parent6d73f95554b2defba5a190b5245e50aa154d68e0 (diff)
downloadicu-e25a54101b72d27b345934e1574aa314c1899969.tar.gz
Android patch: Work-around for ClassNotFoundException.
Android throws ClassNotFoundException when trying to deserialize objects containing references to classes that don't exist. It has not yet been determined whether this is working as intended or whether this is a bug, so in the meantime this local patch for the Android copy of ICU4J makes the code expect it (as this is how Android actually works today, intentional or not). Bug: 19109180 Change-Id: Ibd31b41e89de4286aa0b4fe431c441e84d98b0eb
Diffstat (limited to 'icu4j')
-rw-r--r--icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java
index caf2e8d7c..aa82854f8 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java
@@ -117,6 +117,10 @@ public class CompatibilityTest extends TestFmwk
}
} catch (MissingResourceException e) {
warnln("Could not load the data. " + e.getMessage());
+ // Android patch: Work-around for ClassNotFoundException.
+ } catch (ClassNotFoundException e) {
+ warnln("Could not load the data. " + e.getMessage());
+ // Android patch end.
} catch (Exception e) {
e.printStackTrace();
errln("Exception: " + e.toString());