* jv-valprint.c (java_value_print): Only print non-null Strings.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4c6bf1a3789fd19e4ccb442238624fd37c13eb4e..ac5e8c3b26db2194bf3a212cc14cb2e06c48fabe 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-08  Tom Tromey  <tromey@cygnus.com>
+
+       * jv-valprint.c (java_value_print): Only print non-null Strings.
+
 2000-08-09  Kevin Buettner  <kevinb@redhat.com>
 
        * core-sol2.c (fetch_core_registers): Protoize; add prefatory

diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index f0614fa4523fe8e1e4f312d00eef833a2944fa8b..758e1f621838a90a275e7f5dc408ea20bdc93b52 100644 (file)
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -198,9 +198,10 @@ java_value_print (value_ptr val, struct ui_file *stream, int format,
   if (TYPE_CODE (type) == TYPE_CODE_PTR
       && TYPE_TARGET_TYPE (type)
       && TYPE_NAME (TYPE_TARGET_TYPE (type))
-    && strcmp (TYPE_NAME (TYPE_TARGET_TYPE (type)), "java.lang.String") == 0
+      && strcmp (TYPE_NAME (TYPE_TARGET_TYPE (type)), "java.lang.String") == 0
       && (format == 0 || format == 's')
-      && address != 0)
+      && address != 0
+      && value_as_pointer (val) != 0)
     {
       value_ptr data_val;
       CORE_ADDR data;