Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java |
index 7172413886bf0451197cc0b28b5b27e79c824a5f..ac3d08ba7398092d7dfaab85d5a936d78e6df3e0 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java |
@@ -384,10 +384,13 @@ public class TabPersistentStore extends TabPersister { |
checkAndUpdateMaxTabId(); |
long timeWaitingForPrefetch = SystemClock.uptimeMillis(); |
DataInputStream stream = mPrefetchTabListTask.get(); |
- logExecutionTime("LoadStateInternalPrefetchTime", timeWaitingForPrefetch); |
- readSavedStateFile(stream, |
- createOnTabStateReadCallback(mTabModelSelector.isIncognitoSelected()), null); |
- logExecutionTime("LoadStateInternalTime", time); |
+ if (stream != null) { |
+ logExecutionTime("LoadStateInternalPrefetchTime", timeWaitingForPrefetch); |
+ readSavedStateFile(stream, |
+ createOnTabStateReadCallback(mTabModelSelector.isIncognitoSelected()), |
+ null); |
+ logExecutionTime("LoadStateInternalTime", time); |
+ } |
} catch (Exception e) { |
// Catch generic exception to prevent a corrupted state from crashing app on startup. |
Log.d(TAG, "loadState exception: " + e.toString(), e); |