Same comment here. If you revert the changes in the two files with comments, does the solution still work? Is it possible that the missing initServlet was the problem all along?