tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1237428 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Date Sun, 29 Jan 2012 19:31:42 GMT
Author: markt
Date: Sun Jan 29 19:31:42 2012
New Revision: 1237428

URL: http://svn.apache.org/viewvc?rev=1237428&view=rev
Log:
Remove deprecated code

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1237428&r1=1237427&r2=1237428&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sun Jan 29 19:31:42 2012
@@ -162,14 +162,6 @@ public class ContextConfig implements Li
 
 
     /**
-     * The default web application's context file location.
-     * @deprecated Unnecessary
-     */
-    @Deprecated
-    protected String defaultContextXml = null;
-
-
-    /**
      * The default web application's deployment descriptor location.
      */
     protected String defaultWebXml = null;
@@ -486,12 +478,14 @@ public class ContextConfig implements Li
      */
     protected void contextConfig(Digester digester) {
 
+        String defaultContextXml = null;
+
         // Open the default context.xml file, if it exists
-        if( defaultContextXml==null && context instanceof StandardContext ) {
+        if (context instanceof StandardContext) {
             defaultContextXml = ((StandardContext)context).getDefaultContextXml();
         }
         // set the default if we don't have any overrides
-        if( defaultContextXml==null ) {
+        if (defaultContextXml == null) {
             defaultContextXml = Constants.DefaultContextXml;
         }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message