* Fix for possible NPex in DBusDaemon

      * Add hexdump.jar to Class-Path for libdbus-java.jar

1 files changed, 3 insertions, 2 deletions

diff --git a/org/freedesktop/dbus/bin/DBusDaemon.java b/org/freedesktop/dbus/bin/DBusDaemon.java
index 30ecff9..bedaff3 100644
--- a/org/freedesktop/dbus/bin/DBusDaemon.java
+++ b/org/freedesktop/dbus/bin/DBusDaemon.java
@@ -609,7 +609,7 @@ public class DBusDaemon extends Thread
       while (_run) {
             try {
                Message m;
-               Connstruct c;
+               Connstruct c = null;
                WeakReference<Connstruct> wc;
                synchronized (inqueue) {
                   while (0 == inqueue.size()) try {
@@ -618,7 +618,8 @@ public class DBusDaemon extends Thread
                   
                   m = inqueue.head();
                   wc = inqueue.remove(m);
-                  c = wc.get();
+                  if (null != wc)
+                     c = wc.get();
                }
                if (null != c) {
                   if (Debug.debug) Debug.print(Debug.INFO, "<inqueue> Got message "+m+" from "+c.unique);