summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Feng Qian <fqian@google.com> 2009-04-16 10:05:38 -0700
committer Feng Qian <fqian@google.com> 2009-04-16 11:04:21 -0700
commitbe42388bdb7acdc5ddcfa1f9e896af96e5259485 (patch)
tree591e6fd467851df0f55714d0ccc079f24f4fc5a2
parent7a430cf152fa6a55be2f04e1318baafb69bb5bc0 (diff)
Fix a null pointer exception in DumpRenderTree (issue 1792567)
The first test causes NullPointerException in DumpRenderTree because dumpAsText could return a null string.
-rw-r--r--tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
index bf8a3b35a443..404d1012c7dd 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -165,7 +165,8 @@ public class TestShellActivity extends Activity implements LayoutTestController
if (mDialogStrings != null)
os.write(mDialogStrings.toString().getBytes());
mDialogStrings = null;
- os.write(webkitData.getBytes());
+ if (webkitData != null)
+ os.write(webkitData.getBytes());
os.flush();
os.close();
} catch (IOException ex) {