Attachment #18698 for bug #40133

View | Details | Raw Unified | Return to bug 40133
Collapse All | Expand All

Lines 68-73 Link Here

(-)apache-tomcat-5.5.17-src/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties (+1 lines)
68	standardContext.loginConfig.loginWarning=WARNING: Form login page {0} must start with a ''/'' in Servlet 2.4	68	standardContext.loginConfig.loginWarning=WARNING: Form login page {0} must start with a ''/'' in Servlet 2.4
69	standardContext.loginConfig.required=LoginConfig cannot be null	69	standardContext.loginConfig.required=LoginConfig cannot be null
70	standardContext.mappingError=MAPPING configuration error for relative URI {0}	70	standardContext.mappingError=MAPPING configuration error for relative URI {0}
		71	standardContext.pathRequired=Context path must be configured
71	standardContext.notFound=The requested resource ({0}) is not available.	72	standardContext.notFound=The requested resource ({0}) is not available.
72	standardContext.notReloadable=Reloading is disabled on this Context	73	standardContext.notReloadable=Reloading is disabled on this Context
73	standardContext.notStarted=Context has not yet been started	74	standardContext.notStarted=Context has not yet been started




        Hashtable env = new Hashtable();
        if (getParent() != null)
            env.put(ProxyDirContext.HOST, getParent().getName());
        env.put(ProxyDirContext.CONTEXT, getName());

        try {
	    if (getName() == null)
                throw new IllegalArgumentException
                    (sm.getString("standardContext.pathRequired"));
            env.put(ProxyDirContext.CONTEXT, getName());
            ProxyDirContext proxyDirContext =
                new ProxyDirContext(env, webappResources);
            if (webappResources instanceof FileDirContext) {

Return to bug 40133

Lines 3798-3806 Link Here

(-)apache-tomcat-5.5.17-src/container/catalina/src/share/org/apache/catalina/core/StandardContext.java (-1 / +4 lines)
3798	Hashtable env = new Hashtable();	3798	Hashtable env = new Hashtable();
3799	if (getParent() != null)	3799	if (getParent() != null)
3800	env.put(ProxyDirContext.HOST, getParent().getName());	3800	env.put(ProxyDirContext.HOST, getParent().getName());
3801	env.put(ProxyDirContext.CONTEXT, getName());
3802		3801
3803	try {	3802	try {
		3803	if (getName() == null)
		3804	throw new IllegalArgumentException
		3805	(sm.getString("standardContext.pathRequired"));
		3806	env.put(ProxyDirContext.CONTEXT, getName());
3804	ProxyDirContext proxyDirContext =	3807	ProxyDirContext proxyDirContext =
3805	new ProxyDirContext(env, webappResources);	3808	new ProxyDirContext(env, webappResources);
3806	if (webappResources instanceof FileDirContext) {	3809	if (webappResources instanceof FileDirContext) {