commit db8a53fa5eda4ba60733775ca62e4dd914259c52
author Guang Zhu <guangzhu@google.com> Mon Jul 26 17:42:19 2010 -0700
committer Guang Zhu <guangzhu@google.com> Mon Aug 09 13:29:08 2010 -0700
tree 79cde8a84a2dc96249d9975b1230b75c4e67e797
parent 96f9a830f9072f6bbf8bb73d611430f8ed314bc1

fix crash recovery bug in PopularUrlsTest

Currently the test does not increment page count after relaunched
after a crash. This means the crashed page will be loaded again,
causing a dead loop.

Change-Id: If4591fbd05521f0454151affafec09788e9208d9

tests/src/com/android/browser/PopularUrlsTest.java

diff --git a/tests/src/com/android/browser/PopularUrlsTest.java b/tests/src/com/android/browser/PopularUrlsTest.java
index b1760e9..547cb9f 100644
--- a/tests/src/com/android/browser/PopularUrlsTest.java
+++ b/tests/src/com/android/browser/PopularUrlsTest.java
@@ -307,7 +307,6 @@
 
         public void write() throws IOException {
             FileWriter output = null;
-            OutputStreamWriter writer = null;
             if (mFile.exists()) {
                 mFile.delete();
             }
@@ -317,14 +316,8 @@
                 output.write(page + newLine);
                 output.write(url + newLine);
             } finally {
-                try {
-                    if (writer != null) {
-                        writer.close();
-                    }
-                } finally {
-                    if (output != null) {
-                        output.close();
-                    }
+                if (output != null) {
+                    output.close();
                 }
             }
         }
@@ -394,6 +387,7 @@
 
         if (mStatus.getIsRecovery()) {
             Log.e(TAG, "Recovering after crash: " + iterator.next());
+            mStatus.incrementPage();
         }
 
         while (mStatus.getIteration() < loopCount) {