Fix NPE and dead store warnings. Reported by FindBugs.
Fix NPE and dead store warnings.
Reported by FindBugs.

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

apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat