Revision: 8305
http://playerstage.svn.sourceforge.net/playerstage/?rev=8305&view=rev
Author: thjc
Date: 2009-10-18 14:43:42 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
applied patch 2862998: Remote driver doesn't catch errors thrown in Disconnect
Modified Paths:
--------------
code/player/trunk/libplayercore/remote_driver.cc
Modified: code/player/trunk/libplayercore/remote_driver.cc
===================================================================
--- code/player/trunk/libplayercore/remote_driver.cc 2009-10-18 14:41:58 UTC
(rev 8304)
+++ code/player/trunk/libplayercore/remote_driver.cc 2009-10-18 14:43:42 UTC
(rev 8305)
@@ -119,7 +119,15 @@
{
if (Connected)
{
- ConnectionMap[queue].first->Unsubscribe(local_addr);
+ try
+ {
+ ConnectionMap[queue].first->Unsubscribe(local_addr);
+ }
+ catch (...)
+ {
+ PLAYER_ERROR("Failed to correctly unsubscribe from
remote driver, may result in driver not getting correctly cleaned up");
+ return;
+ }
if (ConnectionMap[queue].first->subscription_count == 0)
{
QueuePointer RemoteQueue =
ConnectionMap[queue].first->Disconnect();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit