Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #2681 Hot undeploy dir deployments. (#2839) 

* Issue #2681 Hot undeploy dir deployments.
This commit is contained in:
Jan Bartel 2018-08-22 16:57:42 +10:00 committed by GitHub
parent 8b7a88608a
commit 51f9a1b5c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
View File

@ -460,21 +460,6 @@ public class WebAppProvider extends ScanningAppProvider
{ {
File file = new File(filename); File file = new File(filename);
//is the file that was removed a directory?
if (file.isDirectory())
{
//is there a .xml file of the same name?
if (exists(file.getName()+".xml")||exists(file.getName()+".XML"))
return; //assume we will get removed events for the xml file
//is there .war file of the same name?
if (exists(file.getName()+".war")||exists(file.getName()+".WAR"))
return; //assume we will get removed events for the war file
super.fileRemoved(filename);
return;
}
//is the file that was removed a .war file? //is the file that was removed a .war file?
String lowname = file.getName().toLowerCase(Locale.ENGLISH); String lowname = file.getName().toLowerCase(Locale.ENGLISH);
if (lowname.endsWith(".war")) if (lowname.endsWith(".war"))
@ -491,6 +476,19 @@ public class WebAppProvider extends ScanningAppProvider
//is the file that was removed an .xml file? //is the file that was removed an .xml file?
if (lowname.endsWith(".xml")) if (lowname.endsWith(".xml"))
{
super.fileRemoved(filename);
return;
}
//is there a .xml file of the same name?
if (exists(file.getName()+".xml")||exists(file.getName()+".XML"))
return; //assume we will get removed events for the xml file
//is there .war file of the same name?
if (exists(file.getName()+".war")||exists(file.getName()+".WAR"))
return; //assume we will get removed events for the war file
super.fileRemoved(filename); super.fileRemoved(filename);
} }