diff options
author | Noel Grandin <noel@peralex.com> | 2014-08-05 13:19:44 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-08-08 09:48:19 +0200 |
commit | b6a83e99c8f4442c3c96198ac816dcb99419a67e (patch) | |
tree | 680dc3e55306b355983aa8c810f610015a95bf5d /qadevOOo/runner | |
parent | 8f020a45fa69c9458844b8b621df2e0b15ec3d16 (diff) |
java: remove redundant null checks
Change-Id: Ia42e5ed715fbd3f5b84029a9844da55f307c6260
Diffstat (limited to 'qadevOOo/runner')
-rw-r--r-- | qadevOOo/runner/helper/ComplexDescGetter.java | 7 | ||||
-rw-r--r-- | qadevOOo/runner/util/ValueChanger.java | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/runner/helper/ComplexDescGetter.java index e269e1816d1c..6e517d712d36 100644 --- a/qadevOOo/runner/helper/ComplexDescGetter.java +++ b/qadevOOo/runner/helper/ComplexDescGetter.java @@ -128,12 +128,7 @@ public class ComplexDescGetter extends DescGetter } String testObjectName = className; - String[] testMethodNames = null; - - if (testMethodNames == null) - { - testMethodNames = testClass.getTestMethodNames(); - } + String[] testMethodNames = testClass.getTestMethodNames(); if (methodNames != null) { testMethodNames = methodNames; diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java index 7b63dab6c161..7f01f8a21a57 100644 --- a/qadevOOo/runner/util/ValueChanger.java +++ b/qadevOOo/runner/util/ValueChanger.java @@ -748,7 +748,7 @@ public class ValueChanger { if (Enum.class.equals(flds[i].getType().getSuperclass())) { Enum value = (Enum) flds[i].get(null) ; - if (newValue == null && !value.equals(oldValue)) { + if (!value.equals(oldValue)) { newValue = value ; break ; } |