You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/06/18 22:47:14 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/fs FileSystemScanner.java
weaver 2004/06/18 13:47:14
Modified: portal/src/java/org/apache/jetspeed/deployment/fs
FileSystemScanner.java
Log:
added better cleanup of open resources
Revision Changes Path
1.7 +40 -9 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/fs/FileSystemScanner.java
Index: FileSystemScanner.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/fs/FileSystemScanner.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileSystemScanner.java 25 Mar 2004 21:39:22 -0000 1.6
+++ FileSystemScanner.java 18 Jun 2004 20:47:14 -0000 1.7
@@ -116,15 +116,14 @@
File aFile = new File(directoryToWatchFile, stagedFiles[i]);
if (!isDeployed(stagedFiles[i]))
{
-
+ FSObjectHandler objHandler =null;
try
{
- FSObjectHandler objHandler = getFSObjectHandler(aFile);
+ objHandler = getFSObjectHandler(aFile);
DeploymentEvent event = new DeploymentEventImpl(DeploymentEvent.EVENT_TYPE_DEPLOY, objHandler);
dispatcher.dispatch(event);
- // we are responsible for reclaiming the FSObject's resource
- objHandler.close();
+
deployedFiles.add(stagedFiles[i]);
// record the lastModified so we can watch for re-deployment
long lastModified = aFile.lastModified();
@@ -135,6 +134,21 @@
{
log.error("Error deploying " + aFile.getAbsolutePath(), e1);
}
+ finally
+ {
+ if(objHandler != null)
+ {
+ try
+ {
+ objHandler.close();
+ }
+ catch (IOException e)
+ {
+
+ }
+ }
+
+ }
}
}
}
@@ -166,15 +180,16 @@
{
continue;
}
-
+
+ FSObjectHandler objHandler = null;
try
{
- FSObjectHandler objHandler = getFSObjectHandler(aFile);
+ objHandler = getFSObjectHandler(aFile);
DeploymentEvent event = new DeploymentEventImpl(DeploymentEvent.EVENT_TYPE_UNDEPLOY, objHandler);
dispatcher.dispatch(event);
- // we are responsible for reclaiming the FSObject's resource
- objHandler.close();
+
+
deployedFiles.remove(i);
fileDates.remove(fileName);
@@ -182,6 +197,22 @@
catch (Exception e1)
{
log.error("Error undeploying " + aFile.getAbsolutePath(), e1);
+ }
+ finally
+ {
+ if(objHandler != null)
+ {
+ try
+ {
+ // we are responsible for reclaiming the FSObject's resource
+ objHandler.close();
+ }
+ catch (IOException e)
+ {
+
+ }
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org