From cba0d59021a2562af6888050a171d4ba3cdbe47e Mon Sep 17 00:00:00 2001
From: Bryce Curtis <curtis.bryce@gmail.com>
Date: Wed, 24 Oct 2012 12:36:30 -0600
Subject: [PATCH] Fix exception when plugin returns a null string.

---
 .../org/apache/cordova/NativeToJsMessageQueue.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
index 55fa2054..03a69b1d 100755
--- a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
+++ b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
@@ -398,7 +398,12 @@ public class NativeToJsMessageQueue {
                     ret += 1 + pluginResult.getMessage().length();
                     break;
                 case PluginResult.MESSAGE_TYPE_STRING: // s
-                    ret += 1 + pluginResult.getStrMessage().length();
+                    if (pluginResult.getStrMessage() == null) {
+                        ret += 1;
+                    }
+                    else {
+                        ret += 1 + pluginResult.getStrMessage().length();
+                    }
                     break;
                 case PluginResult.MESSAGE_TYPE_JSON:
                 default:
@@ -433,8 +438,10 @@ public class NativeToJsMessageQueue {
                       .append(pluginResult.getMessage());
                     break;
                 case PluginResult.MESSAGE_TYPE_STRING: // s
-                    sb.append('s')
-                      .append(pluginResult.getStrMessage());
+                    sb.append('s');
+                    if (pluginResult.getStrMessage() != null) {
+                        sb.append(pluginResult.getStrMessage());
+                    }
                     break;
                 case PluginResult.MESSAGE_TYPE_JSON:
                 default: