From de0f3b4b395f940791ef58d1fd771da5eda23ae0 Mon Sep 17 00:00:00 2001
From: rfm <rfm@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 10 Jan 2012 09:56:57 +0000
Subject: [PATCH] small efficiency fixes from last caching change.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34478 72102866-910b-0410-8b05-ffd578937521
---
 Source/NSBundle.m | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index 715cf38f5..6583ff586 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -1889,10 +1889,9 @@ IF_NO_GC(
     subPath: subPath localization: nil] objectEnumerator];
   while ((path = [pathlist nextObject]) != nil)
     {
-      id	paths = bundle_directory_readable(path);
+      NSArray	*paths = bundle_directory_readable(path);
 
-      if ((id)[NSNull null] != paths
-	&& YES == [(NSArray*)paths containsObject: file])
+      if (YES == [paths containsObject: file])
 	{
 	  path = [path stringByAppendingPathComponent: file];
 	  if (YES == [mgr isReadableFileAtPath: path])
@@ -2013,7 +2012,6 @@ IF_NO_GC(
   NSString *path;
   NSMutableArray *resources;
   NSEnumerator *pathlist;
-  NSFileManager	*mgr = manager();
 
   pathlist = [[NSBundle _bundleResourcePathsWithRootPath: bundlePath
     subPath: subPath localization: localization] objectEnumerator];
@@ -2023,9 +2021,9 @@ IF_NO_GC(
   while ((path = [pathlist nextObject]))
     {
       NSEnumerator *filelist;
-      NSString *match;
+      NSString	*match;
 
-      filelist = [[mgr directoryContentsAtPath: path] objectEnumerator];
+      filelist = [bundle_directory_readable(path) objectEnumerator];
       while ((match = [filelist nextObject]))
 	{
 	  if (allfiles || [extension isEqual: [match pathExtension]])