[jbossweb-commits] JBossWeb SVN: r1653 - branches/3.0.x/java/org/apache/catalina/core and 2 other directories.

Author: remy.maucherat(a)jboss.com Date: 2011-02-10 05:22:18 -0500 (Thu, 10 Feb 2011) New Revision: 1653 Modified: branches/2.1.x/java/org/apache/catalina/core/StandardContext.java branches/3.0.x/java/org/apache/catalina/core/StandardContext.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/catalina/core/StandardContext.java Log: - Fix setting the read only attribute, the type was not right. Modified: branches/2.1.x/java/org/apache/catalina/core/StandardContext.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/core/StandardContext.java 2011-02-10 09:14:54 UTC (rev 1652) +++ branches/2.1.x/java/org/apache/catalina/core/StandardContext.java 2011-02-10 10:22:18 UTC (rev 1653) @@ -5106,10 +5106,9 @@ 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); + getServletContext(); + context.setAttribute(Globals.WORK_DIR_ATTR, dir); + context.setAttributeReadOnly(Globals.WORK_DIR_ATTR); } Modified: branches/3.0.x/java/org/apache/catalina/core/StandardContext.java =================================================================== --- branches/3.0.x/java/org/apache/catalina/core/StandardContext.java 2011-02-10 09:14:54 UTC (rev 1652) +++ branches/3.0.x/java/org/apache/catalina/core/StandardContext.java 2011-02-10 10:22:18 UTC (rev 1653) @@ -4451,10 +4451,9 @@ dir.mkdirs(); // Set the appropriate servlet context attribute - getServletContext().setAttribute(ServletContext.TEMPDIR, dir); - if (getServletContext() instanceof ApplicationContext) - ((ApplicationContext) getServletContext()).setAttributeReadOnly - (ServletContext.TEMPDIR); + getServletContext(); + context.setAttribute(ServletContext.TEMPDIR, dir); + context.setAttributeReadOnly(ServletContext.TEMPDIR); } Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/StandardContext.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/StandardContext.java 2011-02-10 09:14:54 UTC (rev 1652) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/StandardContext.java 2011-02-10 10:22:18 UTC (rev 1653) @@ -5004,10 +5004,9 @@ 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); + getServletContext(); + context.setAttribute(Globals.WORK_DIR_ATTR, dir); + context.setAttributeReadOnly(Globals.WORK_DIR_ATTR); } Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2011-02-10 09:14:54 UTC (rev 1652) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2011-02-10 10:22:18 UTC (rev 1653) @@ -4451,10 +4451,9 @@ dir.mkdirs(); // Set the appropriate servlet context attribute - getServletContext().setAttribute(ServletContext.TEMPDIR, dir); - if (getServletContext() instanceof ApplicationContext) - ((ApplicationContext) getServletContext()).setAttributeReadOnly - (ServletContext.TEMPDIR); + getServletContext(); + context.setAttribute(ServletContext.TEMPDIR, dir); + context.setAttributeReadOnly(ServletContext.TEMPDIR); }