Changeset 123 for trunk

Timestamp:

01/30/06 19:51:12 (19 years ago)

Author:

Erik Huelsmann

Message:

Satisfy read-message-loop assumption of read-message NIL return on eof.

File:

• trunk/protocol.lisp (modified) (2 diffs)

trunk/protocol.lisp ¶

@@ -245 +245 @@
       (when *debug-p*
         (format *debug-stream* "~A" (describe message)))
-      (irc-message-event connection message)
+      (when message
+        (irc-message-event connection message))
       message))) ; needed because of the "loop while" in read-message-loop
 
@@ -294 +295 @@
 (defmethod read-irc-message ((connection connection))
   "Read and parse an IRC-message from the `connection'."
-  (let ((message (create-irc-message
-                  (read-line (network-stream connection) t))))
-    (setf (connection message) connection)
-    message))
+  (handler-case
+    (let ((message (create-irc-message
+                    (read-line (network-stream connection) t))))
+      (setf (connection message) connection)
+      message)
+    (end-of-file)))
+       ;; satisfy read-message-loop assumption of nil when no more messages
 
 (defmethod send-irc-message ((connection connection) command