summaryrefslogtreecommitdiff
path: root/json
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-12-04 11:54:39 -0800
committerElliott Hughes <enh@google.com>2012-12-04 11:54:39 -0800
commitc2d0a1f1bd2c6414c29dd44fe240dcf1f45e59b9 (patch)
tree47052a38cbf61cb7624acc01959d95f5bf220bae /json
parentc02fbeb07ef67396cd7ba8757e8e8918d4d65c50 (diff)
Add detail messages to all remaining NullPointerExceptions.
I've left java.util.concurrent alone, since that's upstream code. Change-Id: I349960aaddb78e55d4c336b58b637009db69ff98
Diffstat (limited to 'json')
-rw-r--r--json/src/main/java/org/json/JSONObject.java2
-rw-r--r--json/src/main/java/org/json/JSONTokener.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/json/src/main/java/org/json/JSONObject.java b/json/src/main/java/org/json/JSONObject.java
index e7ca735519..4e03b5a2a2 100644
--- a/json/src/main/java/org/json/JSONObject.java
+++ b/json/src/main/java/org/json/JSONObject.java
@@ -131,7 +131,7 @@ public class JSONObject {
*/
String key = (String) entry.getKey();
if (key == null) {
- throw new NullPointerException();
+ throw new NullPointerException("key == null");
}
nameValuePairs.put(key, entry.getValue());
}
diff --git a/json/src/main/java/org/json/JSONTokener.java b/json/src/main/java/org/json/JSONTokener.java
index ebfabe47e5..202e2e6c8d 100644
--- a/json/src/main/java/org/json/JSONTokener.java
+++ b/json/src/main/java/org/json/JSONTokener.java
@@ -543,7 +543,7 @@ public class JSONTokener {
*/
public String nextTo(String excluded) {
if (excluded == null) {
- throw new NullPointerException();
+ throw new NullPointerException("excluded == null");
}
return nextToInternal(excluded).trim();
}