Merge lp:~chipaca/go-dbus/fix-1408668 into lp:go-dbus/v1

[John Lenton]

Ignore read errors if the connection has been explicitly closed.

Ignore read errors if the connection has been explicitly closed.

[Michael Vogt (mvo)]

Looks good to me!

review: Approve

=== modified file 'dbus.go'
--- dbus.go	2014-11-19 19:24:28 +0000
+++ dbus.go	2015-01-26 16:27:21 +0000
@@ -35,11 +35,13 @@
 // Connection represents a connection to a message bus.
 type Connection struct {
 	// The unique name of this connection on the message bus.
-	UniqueName string
-	conn       net.Conn
-	writeLock  sync.Mutex
-	busProxy   BusDaemon
-	lastSerial uint32
+	UniqueName   string
+	conn         net.Conn
+	writeLock    sync.Mutex
+	busProxy     BusDaemon
+	lastSerial   uint32
+	connOpen     bool
+	connOpenLock sync.Mutex
 
 	handlerMutex       sync.Mutex // covers the next three
 	messageFilters     []*MessageFilter
@@ -120,9 +122,10 @@
 	if bus.conn, err = trans.Dial(); err != nil {
 		return nil, err
 	}
+	bus.setConnOpen(true)
 
 	if err = authenticate(bus.conn, nil); err != nil {
-		bus.conn.Close()
+		bus.Close()
 		return nil, err
 	}
 
@@ -142,6 +145,18 @@
 	return bus, nil
 }
 
+func (p *Connection) setConnOpen(o bool) {
+	p.connOpenLock.Lock()
+	defer p.connOpenLock.Unlock()
+	p.connOpen = o
+}
+
+func (p *Connection) isConnOpen() bool {
+	p.connOpenLock.Lock()
+	defer p.connOpenLock.Unlock()
+	return p.connOpen
+}
+
 func (p *Connection) Authenticate() error {
 	log.Println("dbus.Connection.Authenticate() is deprecated.  This call can be removed")
 	return nil
@@ -151,7 +166,7 @@
 	for {
 		msg, err := readMessage(p.conn)
 		if err != nil {
-			if err != io.EOF {
+			if err != io.EOF && p.isConnOpen() {
 				log.Println("Failed to read message:", err)
 			}
 			break
@@ -245,6 +260,7 @@
 }
 
 func (p *Connection) Close() error {
+	p.setConnOpen(false)
 	return p.conn.Close()
 }