From ccf8822b4bbee3f4cdf6a5e23901e2a205187522 Mon Sep 17 00:00:00 2001 From: Daniele Alessandri Date: Mon, 2 Dec 2013 15:30:14 +0100 Subject: [PATCH] Minor change in stream connection destructor. --- lib/Predis/Connection/StreamConnection.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/Predis/Connection/StreamConnection.php b/lib/Predis/Connection/StreamConnection.php index 3603515b..f60a52b5 100644 --- a/lib/Predis/Connection/StreamConnection.php +++ b/lib/Predis/Connection/StreamConnection.php @@ -38,9 +38,11 @@ class StreamConnection extends AbstractConnection */ public function __destruct() { - if (isset($this->parameters) && !$this->parameters->persistent) { - $this->disconnect(); + if (isset($this->parameters->persistent) && $this->parameters->persistent) { + return; } + + $this->disconnect(); } /** @@ -48,10 +50,10 @@ class StreamConnection extends AbstractConnection */ protected function createResource() { - $parameters = $this->parameters; - $initializer = "{$parameters->scheme}StreamInitializer"; + $initializer = "{$this->parameters->scheme}StreamInitializer"; + $resource = $this->$initializer($this->parameters); - return $this->$initializer($parameters); + return $resource; } /**