Also ignore close on connection when it's already closed

fprochazka · fprochazka · commit 58de4dbc3bce · 2014-06-21T02:41:38.000+02:00
diff --git a/PhpAmqpLib/Connection/AbstractConnection.php b/PhpAmqpLib/Connection/AbstractConnection.php
@@ -606,8 +606,8 @@ public function channel($channel_id = null)
      */
     public function close($reply_code = 0, $reply_text = "", $method_sig = array(0, 0))
     {
-        if (!$this->protocolWriter) {
-            return;
+        if (!$this->protocolWriter || !$this->isConnected()) {
+            return NULL;
         }
 
         list($class_id, $method_id, $args) = $this->protocolWriter->connectionClose(

Original file line number	Diff line number	Diff line change
`@@ -606,8 +606,8 @@ public function channel($channel_id = null)`
`606`	`606`	`*/`
`607`	`607`	`public function close($reply_code = 0, $reply_text = "", $method_sig = array(0, 0))`
`608`	`608`	`{`
`609`		`- if (!$this->protocolWriter) {`
`610`		`- return;`
	`609`	`+ if (!$this->protocolWriter \|\| !$this->isConnected()) {`
	`610`	`+ return NULL;`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`list($class_id, $method_id, $args) = $this->protocolWriter->connectionClose(`