You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/11/22 18:54:09 UTC
svn commit: r348198 -
/geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java
Author: ammulder
Date: Tue Nov 22 09:54:05 2005
New Revision: 348198
URL: http://svn.apache.org/viewcvs?rev=348198&view=rev
Log:
Try to be a little more graceful if hot deploy directory disappears
Modified:
geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java
Modified: geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java?rev=348198&r1=348197&r2=348198&view=diff
==============================================================================
--- geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java (original)
+++ geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java Tue Nov 22 09:54:05 2005
@@ -138,7 +138,7 @@
} catch (InterruptedException e) {
continue;
}
- if(listener == null || listener.isServerRunning()) {
+ if(listener != null && listener.isServerRunning()) {
scanDirectory();
}
}
@@ -174,6 +174,11 @@
private void scanDirectory() {
File parent = directory;
File[] children = parent.listFiles();
+ if(!directory.exists() || children == null) {
+ log.error("Hot deploy directory has disappeared! Shutting down directory monitor.");
+ done = true;
+ return;
+ }
HashSet oldList = new HashSet(files.keySet());
for (int i = 0; i < children.length; i++) {
File child = children[i];