summaryrefslogtreecommitdiff
path: root/test/utils/python/generate_java_main.py
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-09-09 21:51:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-09 21:51:51 +0000
commit949ce9c1daa2aec83ad4d90d42d2d449141886eb (patch)
treebe2d01e890d908ace99f7da284ea62121665b847 /test/utils/python/generate_java_main.py
parentc90450a201707111e33d6b6f37d431b201849a8b (diff)
parentb47a1cc17f53951b900e56bb68c58c972517cb07 (diff)
Merge "Fix vtable corruption issue" into nyc-mr1-dev
Diffstat (limited to 'test/utils/python/generate_java_main.py')
-rwxr-xr-xtest/utils/python/generate_java_main.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/utils/python/generate_java_main.py b/test/utils/python/generate_java_main.py
index f66d0dd372..1c76b06dda 100755
--- a/test/utils/python/generate_java_main.py
+++ b/test/utils/python/generate_java_main.py
@@ -175,7 +175,11 @@ class Func(mixins.Named, mixins.NameComparableMixin):
return;
}} catch (Error e) {{
System.out.printf("%s-{invoke_type} on {farg}: {callfunc}() threw exception!\\n", s);
- e.printStackTrace(System.out);
+ if (e instanceof IncompatibleClassChangeError) {{
+ System.out.printf("Exception is of type %s\\n", e.getClass().getName());
+ }} else {{
+ e.printStackTrace(System.out);
+ }}
}}
}}
"""