From b664177bd5c2ff19ab163d4aabc5f7712d75517b Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 7 Mar 2018 16:17:57 +0300 Subject: [PATCH] EA-100549: Throw an exception with an additional data instead of Java assertion --- .../src/com/android/tools/klint/checks/ApiClass.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiClass.java b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiClass.java index 80d1771a3d3..4152ed018be 100644 --- a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiClass.java +++ b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiClass.java @@ -22,6 +22,7 @@ import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.utils.Pair; import com.google.common.collect.Lists; +import com.intellij.openapi.util.text.StringUtil; import java.util.HashMap; import java.util.HashSet; @@ -392,14 +393,20 @@ public class ApiClass implements Comparable { for (Pair superClass : mSuperClasses) { ApiClass clz = info.getClass(superClass.getFirst()); - assert clz != null : superClass.getSecond(); + if (clz == null) { + throw new NullPointerException( + "Null is not expected in [" + StringUtil.join(mSuperClasses, ", ") + "], " + superClass.getSecond()); + } clz.addAllFields(info, set); } // Get methods from implemented interfaces as well; for (Pair superClass : mInterfaces) { ApiClass clz = info.getClass(superClass.getFirst()); - assert clz != null : superClass.getSecond(); + if (clz == null) { + throw new NullPointerException( + "Null is not expected in [" + StringUtil.join(mSuperClasses, ", ") + "], " + superClass.getSecond()); + } clz.addAllFields(info, set); } }