Avoid unnecessary cast

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk@1027610 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 26, 2010 · 53b9e4b · 53b9e4b
1 parent 99172d2
commit 53b9e4b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/STATUS.txt b/STATUS.txt
@@ -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. 

diff --git a/container/catalina/src/share/org/apache/catalina/core/StandardContext.java b/container/catalina/src/share/org/apache/catalina/core/StandardContext.java
@@ -4805,11 +4805,11 @@ private void postWorkDirectory() {
         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);
     }
 
 

diff --git a/container/webapps/docs/changelog.xml b/container/webapps/docs/changelog.xml
@@ -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">