X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=0094e1d5d405b2f3155d4ca2011e52eb53a11fe3;hp=3398090a57849cbcfadd3e54b6e665183fb405eb;hb=c1106f71355e2e89dd95e8f847b1f871642344db;hpb=58b2428baa58dfad26e91d3c7a0f70c765e9a963

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 3398090..0094e1d 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-socket-manager.cpp,v 1.24 2004-01-07 13:40:06 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.25 2004-01-30 00:38:28 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -179,6 +179,7 @@ int Yaz_SocketManager::processEvent()
 	    yaz_log (LOG_LOG|LOG_WARN, "select");
 	    return -1;
 	}
+    yaz_log(m_log, "select returned res=%d", res);
     now = time(0);
     for (p = m_observers; p; p = p->next)
     {
@@ -193,7 +194,7 @@ int Yaz_SocketManager::processEvent()
 	if (FD_ISSET(fd, &except))
 	    mask |= YAZ_SOCKET_OBSERVE_EXCEPT;
 	
-	if (mask)
+	if (res > 0 && mask)
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
 	    p->last_activity = now;
@@ -203,7 +204,7 @@ int Yaz_SocketManager::processEvent()
 
 	    yaz_log (m_log, "putEvent I/O mask=%d", mask);
 	}
-	else if (p->timeout && (now - p->last_activity) >= p->timeout)
+	else if ((now - p->last_activity) >= p->timeout)
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
             assert (p->last_activity);