azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EA-100549: Throw an exception with an additional data instead of Java assertion

Browse Source
This commit is contained in:
Yan Zhulanow
2018-03-07 16:17:57 +03:00
parent ec0abb0854
commit b664177bd5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiClass.java
+9 -2
View File
@@ -22,6 +22,7 @@ import com.android.annotations.NonNull;
import com.android.annotations.Nullable; import com.android.annotations.Nullable;
import com.android.utils.Pair; import com.android.utils.Pair;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.openapi.util.text.StringUtil;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -392,14 +393,20 @@ public class ApiClass implements Comparable<ApiClass> {
for (Pair<String, Integer> superClass : mSuperClasses) { for (Pair<String, Integer> superClass : mSuperClasses) {
ApiClass clz = info.getClass(superClass.getFirst()); 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); clz.addAllFields(info, set);
} }
// Get methods from implemented interfaces as well; // Get methods from implemented interfaces as well;
for (Pair<String, Integer> superClass : mInterfaces) { for (Pair<String, Integer> superClass : mInterfaces) {
ApiClass clz = info.getClass(superClass.getFirst()); 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); clz.addAllFields(info, set);
} }
} }