No more NULL pointers from getDirectoryContent
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 30 Nov 2012 12:28:00 +0000 (13:28 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 30 Nov 2012 12:28:00 +0000 (13:28 +0100)
src/com/owncloud/android/datamodel/FileDataStorageManager.java

index 2640404..e011953 100644 (file)
@@ -292,8 +292,8 @@ public class FileDataStorageManager implements DataStorageManager {
 
     @Override
     public Vector<OCFile> getDirectoryContent(OCFile f) {
+        Vector<OCFile> ret = new Vector<OCFile>();
         if (f != null && f.isDirectory() && f.getFileId() != -1) {
-            Vector<OCFile> ret = new Vector<OCFile>();
 
             Uri req_uri = Uri.withAppendedPath(
                     ProviderTableMeta.CONTENT_URI_DIR,
@@ -326,9 +326,8 @@ public class FileDataStorageManager implements DataStorageManager {
             
             Collections.sort(ret);
             
-            return ret;
         }
-        return null;
+        return ret;
     }
 
     private boolean fileExists(String cmp_key, String value) {