Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Thu, 2 Jun 2011 21:18:07 +0000 (21:18 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Thu, 2 Jun 2011 21:18:07 +0000 (21:18 +0000)
commit8243ed4d4d3c01c1310d280c54cef392d5bf934b
treee18e32ae4a45b2d8920520811dbda5d48f876887
parent68bdbb0867abf9f649b2445d7465ee197798ba21
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
Changes required to original fix identified by TCK tests
Need to merge defaults before JSP->Servlet conversion since defaults define JSP servlet.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1130817 13f79535-47bb-0310-9956-ffa450edef68
java/org/apache/catalina/startup/ContextConfig.java