Add proper check before calling stop()

clue · clue · commit ca257c8ae0aa · 2013-04-28T18:19:00.000+02:00
diff --git a/LibEvLoop.php b/LibEvLoop.php
@@ -35,25 +35,24 @@ public function addWriteStream($stream, $listener)
 
     public function removeReadStream($stream)
     {
-        $this->readEvents[(int)$stream]->stop();
-        unset($this->readEvents[(int)$stream]);
+        if (isset($this->readEvents[(int)$stream])) {
+            $this->readEvents[(int)$stream]->stop();
+            unset($this->readEvents[(int)$stream]);
+        }
     }
 
     public function removeWriteStream($stream)
     {
-        $this->writeEvents[(int)$stream]->stop();
-        unset($this->writeEvents[(int)$stream]);
+        if (isset($this->writeEvents[(int)$stream])) {
+            $this->writeEvents[(int)$stream]->stop();
+            unset($this->writeEvents[(int)$stream]);
+        }
     }
 
     public function removeStream($stream)
     {
-        if (isset($this->readEvents[(int)$stream])) {
-            $this->removeReadStream($stream);
-        }
-
-        if (isset($this->writeEvents[(int)$stream])) {
-            $this->removeWriteStream($stream);
-        }
+        $this->removeReadStream($stream);
+        $this->removeWriteStream($stream);
     }
 
     private function addStream($stream, $listener, $flags)

Original file line number	Diff line number	Diff line change
`@@ -35,25 +35,24 @@ public function addWriteStream($stream, $listener)`
`35`	`35`
`36`	`36`	`public function removeReadStream($stream)`
`37`	`37`	`{`
`38`		`- $this->readEvents[(int)$stream]->stop();`
`39`		`- unset($this->readEvents[(int)$stream]);`
	`38`	`+ if (isset($this->readEvents[(int)$stream])) {`
	`39`	`+ $this->readEvents[(int)$stream]->stop();`
	`40`	`+ unset($this->readEvents[(int)$stream]);`
	`41`	`+ }`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`public function removeWriteStream($stream)`
`43`	`45`	`{`
`44`		`- $this->writeEvents[(int)$stream]->stop();`
`45`		`- unset($this->writeEvents[(int)$stream]);`
	`46`	`+ if (isset($this->writeEvents[(int)$stream])) {`
	`47`	`+ $this->writeEvents[(int)$stream]->stop();`
	`48`	`+ unset($this->writeEvents[(int)$stream]);`
	`49`	`+ }`
`46`	`50`	`}`
`47`	`51`
`48`	`52`	`public function removeStream($stream)`
`49`	`53`	`{`
`50`		`- if (isset($this->readEvents[(int)$stream])) {`
`51`		`- $this->removeReadStream($stream);`
`52`		`- }`
`53`		`-`
`54`		`- if (isset($this->writeEvents[(int)$stream])) {`
`55`		`- $this->removeWriteStream($stream);`
`56`		`- }`
	`54`	`+ $this->removeReadStream($stream);`
	`55`	`+ $this->removeWriteStream($stream);`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`private function addStream($stream, $listener, $flags)`