Skip to content

Commit 9cba69c

Browse files
committed
Complete changes required for ".war" extension to be case insensitive
(within the context of the WarFarmDeployer)
1 parent 3648a78 commit 9cba69c

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

java/org/apache/catalina/ha/deploy/FarmWarDeployer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public void messageReceived(ClusterMessage msg) {
228228
// last message received war file is completed
229229
String name = factory.getFile().getName();
230230
if (!name.endsWith(".war")) {
231-
name = name + ".war";
231+
name = (new ContextName(name, true)).getBaseName() + ".war";
232232
}
233233
File deployable = new File(getDeployDirFile(), name);
234234
try {
@@ -419,8 +419,9 @@ public void remove(String contextName, boolean undeploy) throws IOException {
419419
@Override
420420
public void fileModified(File newWar) {
421421
try {
422-
File deployWar = new File(getDeployDirFile(), newWar.getName());
423-
ContextName cn = new ContextName(deployWar.getName(), true);
422+
ContextName cn = new ContextName(newWar.getName(), true);
423+
// Ensure deployed war uses lower case ".war" extension
424+
File deployWar = new File(getDeployDirFile(), cn.getBaseName() + ".war");
424425
if (deployWar.exists() && deployWar.lastModified() > newWar.lastModified()) {
425426
if (log.isInfoEnabled()) {
426427
log.info(sm.getString("farmWarDeployer.alreadyDeployed", cn.getName()));

0 commit comments

Comments
 (0)