Attachment #29212 for bug #53531

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

Lines 998-1004 Link Here

(-)container/catalina/src/share/org/apache/catalina/startup/ContextConfig.java (-1 / +1 lines)
998	try {	998	try {
999	fixDocBase();	999	fixDocBase();
1000	} catch (IOException e) {	1000	} catch (IOException e) {
1001	log.error(sm.getString("contextConfig.fixDocBase"), e);	1001	log.error(sm.getString("contextConfig.fixDocBase", context.getPath()), e);
1002	}	1002	}
1003		1003
1004	}	1004	}




        }

        // Create the new document base directory
        if(!docBase.mkdir() && !docBase.isDirectory())
            throw new IOException(sm.getString("expandWar.createFailed", docBase));

        // Expand the WAR into the new document base directory
        String canonicalDocBasePrefix = docBase.getCanonicalPath();

                if (last >= 0) {
                    File parent = new File(docBase,
                                           name.substring(0, last));
                    if(!parent.mkdirs() && !parent.isDirectory())
                        throw new IOException(sm.getString("expandWar.createFailed", parent));
                }
                if (name.endsWith("/")) {
                    continue;

Lines 57-62 Link Here

(-)container/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties (+1 lines)
57	engineConfig.start=EngineConfig: Processing START	57	engineConfig.start=EngineConfig: Processing START
58	engineConfig.stop=EngineConfig: Processing STOP	58	engineConfig.stop=EngineConfig: Processing STOP
59	expandWar.copy=Error copying {0} to {1}	59	expandWar.copy=Error copying {0} to {1}
		60	expandWar.createFailed=Unable to create the directory [{0}]
60	expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of the remaining files may cause problems	61	expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of the remaining files may cause problems
61	expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an entry contains an illegal path [{1}]	62	expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an entry contains an illegal path [{1}]
62	hostConfig.appBase=Application base directory {0} does not exist	63	hostConfig.appBase=Application base directory {0} does not exist

Return to bug 53531

Lines 132-138 Link Here

(-)container/catalina/src/share/org/apache/catalina/startup/ExpandWar.java (-2 / +4 lines)
132	}	132	}
133		133
134	// Create the new document base directory	134	// Create the new document base directory
135	docBase.mkdir();	135	if(!docBase.mkdir() && !docBase.isDirectory())
		136	throw new IOException(sm.getString("expandWar.createFailed", docBase));
136		137
137	// Expand the WAR into the new document base directory	138	// Expand the WAR into the new document base directory
138	String canonicalDocBasePrefix = docBase.getCanonicalPath();	139	String canonicalDocBasePrefix = docBase.getCanonicalPath();
Lines 162-168 Link Here
162	if (last >= 0) {	163	if (last >= 0) {
163	File parent = new File(docBase,	164	File parent = new File(docBase,
164	name.substring(0, last));	165	name.substring(0, last));
165	parent.mkdirs();	166	if(!parent.mkdirs() && !parent.isDirectory())
		167	throw new IOException(sm.getString("expandWar.createFailed", parent));
166	}	168	}
167	if (name.endsWith("/")) {	169	if (name.endsWith("/")) {
168	continue;	170	continue;