浏览代码

No more NULL pointers from getDirectoryContent

David A. Velasco 12 年之前
父节点
当前提交
e81a7790eb
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      src/com/owncloud/android/datamodel/FileDataStorageManager.java

+ 2 - 3
src/com/owncloud/android/datamodel/FileDataStorageManager.java

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