Clean-up - fix false positive NPE warnings by removing redundant tests and suppressing remaining warnings
Clean-up
- fix false positive NPE warnings by removing redundant tests and suppressing remaining warnings

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@1380380 13f79535-47bb-0310-9956-ffa450edef68

apache/tomcat,Nickname0806/Test_Q4,apache/tomcat,Nickname0806/Test_Q4,apache/tomcat,Nickname0806/Test_Q4,apache/tomcat,Nickname0806/Test_Q4,apache/tomcat