Author: titmuss
Date: Tue Jan 29 16:04:35 2008
New Revision: 1688
URL: http://svn.slimdevices.com?rev=1688&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1684): titmuss | 2008-01-29 23:49:09 +0000
Bug: 6787
Description:
I don't think this is needed but when testing SlimServer:reconnect() it did
leave the server disconnected once.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/jive/net/Comet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 29 16:04:35 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1683
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1684
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/jive/net/Comet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/net/Comet.lua?rev=1688&root=Jive&r1=1687&r2=1688&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/net/Comet.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/net/Comet.lua Tue Jan 29 16:04:35 2008
@@ -780,8 +780,12 @@
end
elseif event.channel == '/meta/disconnect' then
if event.successful then
- self.clientId = nil
- _state(self, UNCONNECTED)
+ -- we may have started CONNECTING again, ignore
+ -- disconnects if we are in the wrong state
+ if self.state == UNCONNECTING then
+ self.clientId = nil
+ _state(self, UNCONNECTED)
+ end
else
return _handleAdvice(self)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
