Fixed rare NPE in File.java

diff --git a/src/com/cooliris/media/SingleDataSource.java b/src/com/cooliris/media/SingleDataSource.java
index 0d9b862..c0f346b 100644 (file)
--- a/src/com/cooliris/media/SingleDataSource.java
+++ b/src/com/cooliris/media/SingleDataSource.java
@@ -142,6 +142,7 @@ public class SingleDataSource implements DataSource {
                 int numItems = items.size();
                 for (int i = 1; i < numItems; ++i) {
                     MediaItem thisItem = items.get(i);
+                    try {
                     String filePath = Uri.fromFile(new File(thisItem.mFilePath)).toString();
                     if (item.mId == thisItem.mId
                             || ((item.mContentUri != null && thisItem.mContentUri != null) && (item.mContentUri
@@ -150,6 +151,10 @@ public class SingleDataSource implements DataSource {
                         --parentSet.mNumItemsLoaded;
                         break;
                     }
+                    } catch (Exception e) {
+                        // NullPointerException at java.io.File.fixSlashes(File.java:267)
+                        continue;
+                    }
                 }
             }
             parentSet.updateNumExpectedItems();

diff --git a/src/com/cooliris/picasa/PicasaApi.java b/src/com/cooliris/picasa/PicasaApi.java
index d045954..9efe82d 100644 (file)
--- a/src/com/cooliris/picasa/PicasaApi.java
+++ b/src/com/cooliris/picasa/PicasaApi.java
@@ -182,6 +182,7 @@ public final class PicasaApi {
                         Log.e(TAG, "getAlbumPhotos: " + e);
                         ++syncResult.stats.numIoExceptions;
                         e.printStackTrace();
+                        return RESULT_ERROR;
                     }
                 }
             }
@@ -256,6 +257,7 @@ public final class PicasaApi {
                         Log.e(TAG, "getAlbumPhotos: " + e);
                         ++syncResult.stats.numIoExceptions;
                         e.printStackTrace();
+                        return RESULT_ERROR;
                     }
                 }
             }