diff options
| author | BrettyWhite <geekman3454@protonmail.com> | 2017-05-04 13:47:05 -0400 |
|---|---|---|
| committer | BrettyWhite <geekman3454@protonmail.com> | 2017-05-04 13:47:05 -0400 |
| commit | 19363b7b89621d4cfd0b571734fd112fcfbd3af1 (patch) | |
| tree | 1c7979abf704473a590d0ceae466aea0d8efe407 | |
| parent | 9b5dc788df241018dd2a4666a0ff2cc4fa2aebe6 (diff) | |
| download | sdl_android-19363b7b89621d4cfd0b571734fd112fcfbd3af1.tar.gz | |
lots of null pointer checksbugfix/utest_diagLevelTests
| -rw-r--r-- | sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java | 2 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java | 33 |
2 files changed, 22 insertions, 13 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java index bc1aa6060..ce24ce4e8 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java @@ -122,7 +122,7 @@ public class DiagLevelTests extends TestCase { assertFalse(Test.FALSE, DiagLevel.isValidDetailLevel(testInvalidS)); assertFalse(Test.FALSE, DiagLevel.isValidDetailLevel(null)); assertNull(Test.NULL, DiagLevel.getLevel(null)); - DiagLevel.setLevel(null, null); + DiagLevel.setLevel(null, null); DiagLevel.setAllLevels(null); } catch (NullPointerException e) { fail("NullPointerException was thrown when attempting to set null values."); diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java b/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java index b77b34486..26dfdebff 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java +++ b/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java @@ -14,29 +14,38 @@ public class DiagLevel { }
public static void setAllLevels(DetailLevel thisDetail) {
- for (int i=0; i < levels.length; i++) {
- levels[i] = thisDetail; //
+ if (thisDetail != null) {
+ for (int i = 0; i < levels.length; i++) {
+ levels[i] = thisDetail; //
+ }
}
}
public static void setLevel(Mod thisMod, DetailLevel thisDetail) {
- levels[thisMod.ordinal()] = thisDetail;
+ if (thisMod != null && thisDetail != null) {
+ levels[thisMod.ordinal()] = thisDetail;
+ }
}
public static DetailLevel getLevel(Mod thisMod) {
- return levels[thisMod.ordinal()];
+ if (thisMod != null) {
+ return levels[thisMod.ordinal()];
+ }
+ return null;
}
-
+
public static boolean isValidDetailLevel(String dtString) {
// Assume false
Boolean isValid = false;
-
- if (dtString.equalsIgnoreCase("verbose"))
- isValid = true;
- else if (dtString.equalsIgnoreCase("terse"))
- isValid = true;
- else if (dtString.equalsIgnoreCase("off"))
- isValid = true;
+
+ if (dtString != null) {
+ if (dtString.equalsIgnoreCase("verbose"))
+ isValid = true;
+ else if (dtString.equalsIgnoreCase("terse"))
+ isValid = true;
+ else if (dtString.equalsIgnoreCase("off"))
+ isValid = true;
+ }
return isValid;
}
|