From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 Oct 2010 15:16:35 +0000 (+0000)
Subject: Avoid unnecessary cast
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0290d3a418623d127bf1ffdf6a0d881cea76a468;p=tomcat7.0

Avoid unnecessary cast

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1022134 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index e810ebf38..e46e76139 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5562,11 +5562,11 @@ public class StandardContext extends ContainerBase
         dir.mkdirs();
 
         // Set the appropriate servlet context attribute
-        getServletContext().setAttribute(ServletContext.TEMPDIR, dir);
-        if (getServletContext() instanceof ApplicationContext)
-            ((ApplicationContext) getServletContext()).setAttributeReadOnly
-                (ServletContext.TEMPDIR);
-
+        if (context == null) {
+            getServletContext();
+        }
+        context.setAttribute(ServletContext.TEMPDIR, dir);
+        context.setAttributeReadOnly(ServletContext.TEMPDIR);
     }