diff options
7 files changed, 24 insertions, 20 deletions
diff --git a/dalvik/src/main/java/dalvik/system/VMDebug.java b/dalvik/src/main/java/dalvik/system/VMDebug.java index ace149cef5..8f40165d9d 100644 --- a/dalvik/src/main/java/dalvik/system/VMDebug.java +++ b/dalvik/src/main/java/dalvik/system/VMDebug.java @@ -165,11 +165,10 @@ public final class VMDebug { * @param flags flags to control method tracing. The only one that * is currently defined is {@link #TRACE_COUNT_ALLOCS}. */ - public static void startMethodTracing(String traceFileName, - int bufferSize, int flags) { + public static void startMethodTracing(String traceFileName, int bufferSize, int flags) { if (traceFileName == null) { - throw new NullPointerException(); + throw new NullPointerException("traceFileName == null"); } startMethodTracingNative(traceFileName, null, bufferSize, flags); @@ -183,8 +182,11 @@ public final class VMDebug { public static void startMethodTracing(String traceFileName, FileDescriptor fd, int bufferSize, int flags) { - if (traceFileName == null || fd == null) { - throw new NullPointerException(); + if (traceFileName == null) { + throw new NullPointerException("traceFileName == null"); + } + if (fd == null) { + throw new NullPointerException("fd == null"); } startMethodTracingNative(traceFileName, fd, bufferSize, flags); @@ -291,15 +293,16 @@ public final class VMDebug { * * The VM may create a temporary file in the same directory. * - * @param fileName Full pathname of output file (e.g. "/sdcard/dump.hprof"). + * @param filename Full pathname of output file (e.g. "/sdcard/dump.hprof"). * @throws UnsupportedOperationException if the VM was built without * HPROF support. * @throws IOException if an error occurs while opening or writing files. */ - public static void dumpHprofData(String fileName) throws IOException { - if (fileName == null) - throw new NullPointerException(); - dumpHprofData(fileName, null); + public static void dumpHprofData(String filename) throws IOException { + if (filename == null) { + throw new NullPointerException("filename == null"); + } + dumpHprofData(filename, null); } /** diff --git a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java index 61bee34d24..7717fd9996 100644 --- a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java +++ b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/DdmServer.java @@ -50,9 +50,9 @@ public class DdmServer { * Throws an exception if the type already has a handler registered. */ public static void registerHandler(int type, ChunkHandler handler) { - if (handler == null) - throw new NullPointerException(); - + if (handler == null) { + throw new NullPointerException("handler == null"); + } synchronized (mHandlerMap) { if (mHandlerMap.get(type) != null) throw new RuntimeException("type " + Integer.toHexString(type) @@ -171,4 +171,3 @@ public class DdmServer { return handler.handleChunk(chunk); } } - 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(); } diff --git a/luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java b/luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java index ab76e8e8c2..4035090c11 100644 --- a/luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java +++ b/luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java @@ -143,7 +143,7 @@ public abstract class AbstractSelectableChannel extends SelectableChannel { throw new IllegalSelectorException(); } // throw NPE exactly to keep consistency - throw new NullPointerException(); + throw new NullPointerException("selector not open"); } SelectionKey key = keyFor(selector); if (key == null) { diff --git a/luni/src/main/java/java/util/ListResourceBundle.java b/luni/src/main/java/java/util/ListResourceBundle.java index fc6ab9718c..7809b9a2d1 100644 --- a/luni/src/main/java/java/util/ListResourceBundle.java +++ b/luni/src/main/java/java/util/ListResourceBundle.java @@ -119,7 +119,7 @@ public abstract class ListResourceBundle extends ResourceBundle { table = new HashMap<String, Object>(contents.length / 3 * 4 + 3); for (Object[] content : contents) { if (content[0] == null || content[1] == null) { - throw new NullPointerException(); + throw new NullPointerException("null entry"); } table.put((String) content[0], content[1]); } diff --git a/luni/src/main/java/java/util/Locale.java b/luni/src/main/java/java/util/Locale.java index 51636a70cb..3f1874de9a 100644 --- a/luni/src/main/java/java/util/Locale.java +++ b/luni/src/main/java/java/util/Locale.java @@ -271,7 +271,9 @@ public final class Locale implements Cloneable, Serializable { */ public Locale(String language, String country, String variant) { if (language == null || country == null || variant == null) { - throw new NullPointerException(); + throw new NullPointerException("language=" + language + + ",country=" + country + + ",variant=" + variant); } if (language.isEmpty() && country.isEmpty()) { languageCode = ""; @@ -564,7 +566,7 @@ public final class Locale implements Cloneable, Serializable { */ public synchronized static void setDefault(Locale locale) { if (locale == null) { - throw new NullPointerException(); + throw new NullPointerException("locale == null"); } defaultLocale = locale; } |