Null checks

tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java

diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java
index 432ce65..b9182ce 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java
@@ -83,11 +83,8 @@
       BarELContext barContext = new BarELContext();
       ELContext context = barContext.getELContext();
 
-      if (barContext != null) {
-        ELResolver resolver = barContext.getELResolver();
-        pass = ResolverTest.testELResolver(context, resolver, null, "Bar",
-            "Foo", buf, true);
-      }
+      ELResolver resolver = barContext.getELResolver();
+      pass = ResolverTest.testELResolver(context, resolver, null, "Bar", "Foo", buf, true);
     } catch (Exception ex) {
       throw new Exception(ex);
     }

tck/src/main/java/com/sun/ts/tests/el/common/api/expression/ExpressionTest.java

diff --git a/tck/src/main/java/com/sun/ts/tests/el/common/api/expression/ExpressionTest.java b/tck/src/main/java/com/sun/ts/tests/el/common/api/expression/ExpressionTest.java
index 87c6ff7..a0f3797 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/common/api/expression/ExpressionTest.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/common/api/expression/ExpressionTest.java
@@ -329,6 +329,7 @@
       return false;
     } else {
       int hcode1 = exp1.hashCode();
+      @SuppressWarnings("null") // exp2 cannot be null here
       int hcode2 = exp2.hashCode();
 
       if (hcode1 != hcode2) {