Mercurial > illumos > illumos-gate

changeset 11283:18342ccbe3cf onnv_130

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6905805 trackerd crashed during poweroff
author fei feng - Sun Microsystems - Beijing China <Fei.Feng@Sun.COM>
date Tue, 08 Dec 2009 11:39:17 +0800
parents cf14d34d606b
children f8479ccdcb73
files usr/src/lib/hal/libhal/common/libhal.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/hal/libhal/common/libhal.c	Tue Dec 08 08:44:19 2009 +0530
+++ b/usr/src/lib/hal/libhal/common/libhal.c	Tue Dec 08 11:39:17 2009 +0800
@@ -3223,8 +3223,8 @@
 				       "interface='org.freedesktop.Hal.Manager',"
 				       "sender='org.freedesktop.Hal',"
 				       "path='/org/freedesktop/Hal/Manager'", &myerror);
-		if (dbus_error_is_set (&myerror)) {
-			dbus_move_error (&myerror, error);
+		dbus_move_error(&myerror, error);
+		if (error != NULL && dbus_error_is_set(error)) {
 			fprintf (stderr, "%s %d : Error unsubscribing to signals, error=%s\n", 
 				 __FILE__, __LINE__, error->message);
 			/** @todo  clean up */