jfarcand 2003/05/28 21:13:24
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
Revert back my latest changes since it did not fix the problem completely.
Revision Changes Path
1.63 +7 -25
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- StandardContext.java 28 May 2003 15:08:33 -0000 1.62
+++ StandardContext.java 29 May 2003 04:13:24 -0000 1.63
@@ -257,12 +257,7 @@
private boolean crossContext = false;
- /**
- * The default context name used for config file
- */
- private String defaultConfigFile = "context.xml";
-
- /**
+ /**
* The display name of this web application.
*/
private String displayName = null;
@@ -3878,25 +3873,12 @@
if (name.equals("")) {
name = "ROOT";
}
- File fileBase = new File(appBase);
- File file = new File(fileBase, name + ".xml");
-
- /*
- * Try to save the context information using a default file name.
- */
- if (!file.exists()){
- file = new File(fileBase, getDocBase() + File.separator +
defaultConfigFile);
- }
+ File file = new File(appBase);
+ file = new File(file, name + ".xml");
- // Make sure the file exist before setting it.
- if (file.exists()){
- setConfigFile(file.getPath());
- if( log.isDebugEnabled() )
- log.debug( "Set config file " + file);
- } else {
- if( log.isDebugEnabled() )
- log.debug( "Config file doesn't exists: " + file);
- }
+ setConfigFile(file.getPath());
+ if( log.isDebugEnabled() )
+ log.debug( "Set config file " + file);
}
// Add missing components as necessary
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
