Merge branch '4.5.0' of https://github.com/adaptivecomputing/torque i…

…nto 4.5.0
adaptivecomputing · Dec 4, 2013 · a852aa0 · a852aa0
2 parents b0cdac8 + 08e458d
commit a852aa0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/lib/Libifl/tm.c b/src/lib/Libifl/tm.c
@@ -1387,7 +1387,8 @@ tm_register(tm_whattodo_t *what, tm_event_t *event)
   return TM_ENOTIMPLEMENTED;
   }
 
-#define FOREVER 2592000
+#define FOREVER              2592000
+#define INITIALPOLLTIMEOUT   5
 
 /*
 ** tm_poll - poll to see if an event has been completed.
@@ -1478,7 +1479,7 @@ int tm_poll(
   ** Setup tcp dis routines with a wait value appropriate for
   ** the value of wait the user set.
   */
-  pbs_tcp_timeout = wait ? FOREVER : 1;
+  pbs_tcp_timeout = wait ? INITIALPOLLTIMEOUT : 1;
 
   prot = disrsi(static_chan, &ret);