Dont't stop if directory can't be openedbecause of user rights etc

1 files changed, 16 insertions, 2 deletions

diff --git a/ext/spl/examples/cachingrecursiveiterator.inc b/ext/spl/examples/cachingrecursiveiterator.inc
index cb89fdb6d8..55acd1e195 100644
--- a/ext/spl/examples/cachingrecursiveiterator.inc
+++ b/ext/spl/examples/cachingrecursiveiterator.inc
@@ -4,14 +4,28 @@ class CachingRecursiveIterator extends CachingIterator implements RecursiveItera
 {
 	protected $hasChildren;
 	protected $getChildren;
+	protected $catch_get_child_exceptions;
 
-	function __construct(RecursiveIterator $it) {
+	function __construct(RecursiveIterator $it, $catch_get_child_exceptions = false) {
+		$this->catch_get_child_exceptions = $catch_get_child_exceptions;
 		parent::__construct($it);
 	}
 	
 	function next() {
 		if ($this->hasChildren = $this->it->hasChildren()) {
-			$this->getChildren = new CachingRecursiveIterator($this->it->getChildren());
+			try {
+				//$this->getChildren = new CachingRecursiveIterator($this->it->getChildren(), $this->catch_get_child_exceptions);
+				// workaround memleaks...
+				$child = $this->it->getChildren();
+				$this->getChildren = new CachingRecursiveIterator($child, $this->catch_get_child_exceptions);
+			}
+			catch(Exception $e) {
+				if (!$this->catch_get_child_exceptions) {
+					throw $e;
+				}
+				$this->hasChildren = false;
+				$this->getChildren = NULL;
+			}
 		} else {
 			$this->getChildren = NULL;
 		}