diff options
| author | Matthew Johnson <mjj29@matthew.ath.cx> | 2008-07-21 11:45:51 +0100 |
|---|---|---|
| committer | Matthew Johnson <mjj29@matthew.ath.cx> | 2008-07-21 11:45:51 +0100 |
| commit | a44e6a460ad34f7bb0fc21868afab35467b0fe59 (patch) | |
| tree | 0cb2ead8c35fa367e673e2167bcedd8ee8a55f86 | |
| parent | a57a7e7224e33c38ad4a5b47c91322045d750645 (diff) | |
* Fix for possible NPex in DBusDaemon
* Add hexdump.jar to Class-Path for libdbus-java.jar
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | changelog | 5 | ||||
| -rw-r--r-- | org/freedesktop/dbus/bin/DBusDaemon.java | 5 |
3 files changed, 9 insertions, 3 deletions
@@ -87,7 +87,7 @@ translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exc sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@ libdbus-java-$(VERSION).jar: .classes - echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest + echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/hexdump.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class) dbus-java-test-$(VERSION).jar: .testclasses echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest @@ -1,3 +1,8 @@ +Version 2.5.1: + + * Fix for possible NPex in DBusDaemon + * Add hexdump.jar to Class-Path for libdbus-java.jar + Version 2.5: * Patch from Omair Majid <omajid -at- redhat -dot- com> to 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); |