summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@qadesh.matthew.ath.cx>2009-03-29 11:26:58 +0000
committerMatthew Johnson <mjj29@qadesh.matthew.ath.cx>2009-03-29 11:26:58 +0000
commit5922b1827f4dcc0e78ff462bc461e72327830fd9 (patch)
tree2b0d829a53541d1f0c0fbbf1ab07f45ed0aaa02d
parent0f2076ea64f32732321df4b445216bb77f744a7d (diff)
parent81d33080f362aeae5998496fbf6d6a5815b56142 (diff)
Merge branch 'master' of git+ssh://illythia.matthew.ath.cx/home/mjj29/scm/dbus-java
-rw-r--r--debug.conf4
-rw-r--r--org/freedesktop/dbus/test/test.java3
2 files changed, 3 insertions, 4 deletions
diff --git a/debug.conf b/debug.conf
index 8320da8..ef244b6 100644
--- a/debug.conf
+++ b/debug.conf
@@ -9,14 +9,14 @@ org.freedesktop.dbus.AbstractConnection$_thread = ERR
org.freedesktop.dbus.AbstractConnection$_sender = ERR
org.freedesktop.dbus.DirectConnection = ERR
org.freedesktop.dbus.DBusConnection = ERR
-org.freedesktop.dbus.DBusConnection$PeerSet = ERR
+org.freedesktop.dbus.DBusConnection$PeerSet = DEBUG
org.freedesktop.dbus.AbstractConnection$1 = ERR
org.freedesktop.dbus.DBusSignal = ERR
org.freedesktop.dbus.EfficientQueue = ERR
org.freedesktop.dbus.Transport = ERR
org.freedesktop.dbus.Transport$SASL = ERR
org.freedesktop.dbus.Transport$SASL$Command = ERR
-org.freedesktop.dbus.Marshalling = VERBOSE
+org.freedesktop.dbus.Marshalling = ERR
org.freedesktop.dbus.ObjectTree = ERR
org.freedesktop.dbus.BusAddress = ERR
org.freedesktop.dbus.RemoteInvocationHandler = ERR
diff --git a/org/freedesktop/dbus/test/test.java b/org/freedesktop/dbus/test/test.java
index cc84490..fe171a6 100644
--- a/org/freedesktop/dbus/test/test.java
+++ b/org/freedesktop/dbus/test/test.java
@@ -584,6 +584,7 @@ public class test
peers.add("org.freedesktop.DBus");
clientconn.requestBusName("test.testclient");
peers.add("test.testclient");
+ clientconn.releaseBusName("test.testclient");
System.out.println("Pinging ourselves");
/** Call ping. */
@@ -856,8 +857,6 @@ public class test
test.fail("Failed to check nested lists");
System.out.println("done");
- clientconn.releaseBusName("test.testclient");
-
System.out.print("Testing dynamic object creation...");
TestNewInterface tni = tri2.getNew();
System.out.print(tni.getName()+" ");