Author: markt Date: Tue Oct 26 16:02:35 2010 New Revision: 1027610 URL: http://svn.apache.org/viewvc?rev=1027610&view=rev Log: Avoid unnecessary cast
Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardContext.java tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1027610&r1=1027609&r2=1027610&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Oct 26 16:02:35 2010 @@ -76,11 +76,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, kkolinko, timw -1: -* Avoid unnecessary cast - http://svn.apache.org/viewvc?rev=1022134&view=rev - +1: markt, kkolinko, rjung, timw - -1: - * Improve sending an access message in DeltaManager. maxInactiveInterval of not Manager but the session is used. If maxInactiveInterval is negative, an access message is not sending. Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardContext.java?rev=1027610&r1=1027609&r2=1027610&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardContext.java Tue Oct 26 16:02:35 2010 @@ -4805,11 +4805,11 @@ public class StandardContext dir.mkdirs(); // Set the appropriate servlet context attribute - getServletContext().setAttribute(Globals.WORK_DIR_ATTR, dir); - if (getServletContext() instanceof ApplicationContext) - ((ApplicationContext) getServletContext()).setAttributeReadOnly - (Globals.WORK_DIR_ATTR); - + if (context == null) { + getServletContext(); + } + context.setAttribute(Globals.WORK_DIR_ATTR, dir); + context.setAttributeReadOnly(Globals.WORK_DIR_ATTR); } Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1027610&r1=1027609&r2=1027610&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Oct 26 16:02:35 2010 @@ -47,6 +47,13 @@ </fix> </changelog> </subsection> + <subsection name="Catalina"> + <changelog> + <fix> + Avoid unnecessary cast in StandardContext. (markt) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 5.5.31 (jim)" rtext="released 2010-09-16"> <subsection name="General"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org