--- a/DirectoryContents.st	Fri Apr 24 08:19:16 2009 +0200
+++ b/DirectoryContents.st	Thu Apr 30 13:38:44 2009 +0200
@@ -275,9 +275,12 @@
                 (checkIsValidBlock value:directory) ifTrue:[
                     "/ keep the last accessed directory at end
                     CachedDirectories add:directory.
+                ] ifFalse:[
+                    "/ validation block answers false - return nil and removed from cache
+                    directory := nil.
                 ].
-            ]
-        ]
+            ].
+        ].
     ].
     ^ directory
 ! !
@@ -602,10 +605,22 @@
     ^ contents size == 0
 !
 
+isEmptyOrNil
+    "retuirns true if directory is empty
+    "
+    ^ contents size == 0
+!
+
 notEmpty
     "returns true if directory is not empty
     "
     ^ contents size ~~ 0
+!
+
+notEmptyOrNil
+    "returns true if directory is not empty
+    "
+    ^ contents size ~~ 0
 ! !
 
 !DirectoryContents::DirectoryContentsItem class methodsFor:'instance creation'!
@@ -773,7 +788,7 @@
 !DirectoryContents class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/DirectoryContents.st,v 1.53 2009-03-27 13:06:24 fm Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/DirectoryContents.st,v 1.54 2009-04-30 11:38:44 ca Exp $'
 ! !
 
 DirectoryContents initialize!