cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [01/11] cordova-plugin-file git commit: CB-8689 Fix NPE in makeEntryForNativeUri (was affecting file-transfer)
Date Tue, 31 Mar 2015 17:58:10 GMT
Repository: cordova-plugin-file
Updated Branches:
  refs/heads/old-ID d57238b5b -> 44da98349


CB-8689 Fix NPE in makeEntryForNativeUri (was affecting file-transfer)

Regression was introduced in a recent commit and was never released.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/commit/5b1afc28
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/5b1afc28
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/5b1afc28

Branch: refs/heads/old-ID
Commit: 5b1afc28123e8fbe2b09a278ca748914c22b3ca1
Parents: d57238b
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Mar 17 09:54:48 2015 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Mar 17 09:54:48 2015 -0400

----------------------------------------------------------------------
 src/android/Filesystem.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/5b1afc28/src/android/Filesystem.java
----------------------------------------------------------------------
diff --git a/src/android/Filesystem.java b/src/android/Filesystem.java
index 46786f3..478f6f0 100644
--- a/src/android/Filesystem.java
+++ b/src/android/Filesystem.java
@@ -83,12 +83,12 @@ public abstract class Filesystem {
 
     public JSONObject makeEntryForURL(LocalFilesystemURL inputURL) {
         Uri nativeUri = toNativeUri(inputURL);
-        return makeEntryForURL(inputURL, nativeUri);
+        return nativeUri == null ? null : makeEntryForURL(inputURL, nativeUri);
     }
 
     public JSONObject makeEntryForNativeUri(Uri nativeUri) {
         LocalFilesystemURL inputUrl = toLocalUri(nativeUri);
-        return makeEntryForURL(inputUrl, nativeUri);
+        return inputUrl == null ? null : makeEntryForURL(inputUrl, nativeUri);
     }
 
     public JSONObject getEntryForLocalURL(LocalFilesystemURL inputURL) throws IOException
{


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message