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

(-)src/main/java/org/apache/catalina/Container.java (+1 lines)
Lines 319-324 Link Here
319
        if (host != null && ((Host) host).getXmlBase() != null) {
319
        if (host != null && ((Host) host).getXmlBase() != null) {
320
            result.append(((Host) host).getXmlBase()).append('/');
320
            result.append(((Host) host).getXmlBase()).append('/');
321
        } else {
321
        } else {
322
            result.append("conf/");
322
            if (engine != null) {
323
            if (engine != null) {
323
                result.append(engine.getName()).append('/');
324
                result.append(engine.getName()).append('/');
324
            }
325
            }
(-)src/main/java/org/apache/catalina/startup/ContextConfig.java (-2 / +2 lines)
Lines 472-478 Link Here
472
472
473
            String hostContextFile = Container.getConfigPath(context, Constants.HostContextXml);
473
            String hostContextFile = Container.getConfigPath(context, Constants.HostContextXml);
474
            try (ConfigurationSource.Resource contextXmlResource =
474
            try (ConfigurationSource.Resource contextXmlResource =
475
                    ConfigFileLoader.getSource().getConfResource(hostContextFile)) {
475
                    ConfigFileLoader.getSource().getResource(hostContextFile)) {
476
                URL defaultContextUrl = contextXmlResource.getURI().toURL();
476
                URL defaultContextUrl = contextXmlResource.getURI().toURL();
477
                processContextConfig(digester, defaultContextUrl, contextXmlResource.getInputStream());
477
                processContextConfig(digester, defaultContextUrl, contextXmlResource.getInputStream());
478
            } catch (MalformedURLException e) {
478
            } catch (MalformedURLException e) {
Lines 1898-1904 Link Here
1898
                }
1898
                }
1899
            } else {
1899
            } else {
1900
                String hostWebXml = Container.getConfigPath(context, Constants.HostWebXml);
1900
                String hostWebXml = Container.getConfigPath(context, Constants.HostWebXml);
1901
                webXmlResource = ConfigFileLoader.getSource().getConfResource(hostWebXml);
1901
                webXmlResource = ConfigFileLoader.getSource().getResource(hostWebXml);
1902
            }
1902
            }
1903
        } catch (IOException e) {
1903
        } catch (IOException e) {
1904
            // Ignore if not found
1904
            // Ignore if not found

Return to bug 63740