Continued:

[core.git] / framework / main / exceptions / socket / class_InvalidSocketException.php

diff --git a/framework/main/exceptions/socket/class_InvalidSocketException.php b/framework/main/exceptions/socket/class_InvalidSocketException.php
index 3d817388198857691e3a5aadb50132a033007bd2..d53a45715cf11337da2278e05425d866f9e59010 100644 (file)
--- a/framework/main/exceptions/socket/class_InvalidSocketException.php
+++ b/framework/main/exceptions/socket/class_InvalidSocketException.php
@@ -34,28 +34,14 @@ class InvalidSocketException extends AbstractSocketException {
         * @return      void
         */
        public function __construct (array $messageData, $code) {
-               // Is it a resource?
-               if (is_resource($messageData[1])) {
-                       // Get last error
-                       $lastError = socket_last_error($messageData[1]);
-
-                       // Construct the message
-                       $message = sprintf('[%s:] Invalid socket, type=%s, errno=%s, errstr=%s',
-                               $messageData[0]->__toString(),
-                               gettype($messageData[1]),
-                               $lastError,
-                               socket_strerror($lastError)
-                       );
-               } else {
-                       // Construct the message
-                       $message = sprintf('[%s:] Invalid socket, type=%s(%s), errno=%s, errstr=%s',
-                               $messageData[0]->__toString(),
-                               $messageData[1],
-                               gettype($messageData[1]),
-                               $messageData[2],
-                               $messageData[3]
-                       );
-               }
+               // Construct the message
+               $message = sprintf('[%s:] Invalid socketResource[%s]=%s, errno=%s, errstr=%s',
+                       $messageData[0]->__toString(),
+                       gettype($messageData[0]->getSocketResource()),
+                       $messageData[0]->getSocketResource(),
+                       $messageData[1],
+                       $messageData[2]
+               );
 
                // Call parent exception constructor
                parent::__construct($message, $code);