From d1402a5a60652c287df849b59ec2f3443f723600 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sat, 26 Nov 2005 03:05:37 +0000 Subject: [PATCH] added some extra traps --- lib/WebGUI/Cache/FileCache.pm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/WebGUI/Cache/FileCache.pm b/lib/WebGUI/Cache/FileCache.pm index 470f736ac..c8f075c7a 100644 --- a/lib/WebGUI/Cache/FileCache.pm +++ b/lib/WebGUI/Cache/FileCache.pm @@ -52,7 +52,10 @@ Remove content from the filesystem cache. sub delete { my $self = shift; - rmtree($self->getFolder()); + my $folder = $self->getFolder; + if (-e $folder) { + rmtree($folder); + } } #------------------------------------------------------------------- @@ -69,8 +72,10 @@ A partial composite key to remove. sub deleteChunk { my $self = shift; - my $key = $self->parseKey(shift); - rmtree($self->getNamespaceRoot()."/".$key); + my $folder = $self->getNamespaceRoot."/".$self->parseKey(shift); + if (-e $folder) { + rmtree($folder); + } } #------------------------------------------------------------------- @@ -84,7 +89,10 @@ Remove all objects from the filecache system. sub flush { my $self = shift; $self->SUPER::flush(); - rmtree($self->getNamespaceRoot); + my $folder = $self->getNamespaceRoot; + if (-e $folder) { + rmtree($folder); + } } #------------------------------------------------------------------- @@ -170,7 +178,9 @@ sub getNamespaceSize { my $expires = ; close(FILE); if ($expires < time()+$expiresModifier) { - rmtree($path); + if (-e $path) { + rmtree($path); + } } else { my (@attributes) = stat($path.'/'.$file); $filesRemaining += $attributes[7];