am 4fbf81bc: check for null item in web history in saveState

Merge commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e' into eclair-plus-aosp

* commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e':
  check for null item in web history in saveState
This commit is contained in:
Cary Clark
2009-09-29 13:32:08 -07:00
committed by Android Git Automerger

View File

@@ -1111,6 +1111,12 @@ public class WebView extends AbsoluteLayout
ArrayList<byte[]> history = new ArrayList<byte[]>(size);
for (int i = 0; i < size; i++) {
WebHistoryItem item = list.getItemAtIndex(i);
if (null == item) {
// FIXME: this shouldn't happen
// need to determine how item got set to null
Log.w(LOGTAG, "saveState: Unexpected null history item.");
return null;
}
byte[] data = item.getFlattenedData();
if (data == null) {
// It would be very odd to not have any data for a given history