Attachment #29050 for bug #53531

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

Lines 132-138 Link Here

(-)java/org/apache/catalina/startup/ExpandWar.java (-2 / +5 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
		167	if(!parent.mkdirs() && !parent.isDirectory())
		168	throw new IOException(sm.getString("expandWar.createFailed", parent));
166	}	169	}
167	if (name.endsWith("/")) {	170	if (name.endsWith("/")) {
168	continue;	171	continue;

Lines 61-66 Link Here

(-)java/org/apache/catalina/startup/LocalStrings.properties (+1 lines)
61	expandWar.copy=Error copying {0} to {1}	61	expandWar.copy=Error copying {0} to {1}
62	expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of the remaining files may cause problems	62	expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of the remaining files may cause problems
63	expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an entry contains an illegal path [{1}]	63	expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an entry contains an illegal path [{1}]
		64	expandWar.createFailed=Unable to create the directory [{0}]
64	hostConfig.appBase=Application base directory {0} does not exist	65	hostConfig.appBase=Application base directory {0} does not exist
65	hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]	66	hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
66	hostConfig.cce=Lifecycle event data object {0} is not a Host	67	hostConfig.cce=Lifecycle event data object {0} is not a Host

Return to bug 53531