[Box Backup-dev] COMMIT r264 - box/chris/win32/vc2005-compile-fixes/bin/bbackupd

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Thu, 22 Dec 2005 00:38:49 +0000 (GMT)


Author: chris
Date: 2005-12-22 00:38:45 +0000 (Thu, 22 Dec 2005)
New Revision: 264

Modified:
   box/chris/win32/vc2005-compile-fixes/bin/bbackupd/BackupDaemon.cpp
Log:
* bin/bbackupd/BackupDaemon.cpp
- Ignore exceptions thrown while closing command socket after receiving
  an exception, to avoid masking that exception


Modified: box/chris/win32/vc2005-compile-fixes/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/chris/win32/vc2005-compile-fixes/bin/bbackupd/BackupDaemon.cpp	2005-12-22 00:35:50 UTC (rev 263)
+++ box/chris/win32/vc2005-compile-fixes/bin/bbackupd/BackupDaemon.cpp	2005-12-22 00:38:45 UTC (rev 264)
@@ -400,7 +400,16 @@
 	{
 		if(mpCommandSocketInfo != 0)
 		{
-			delete mpCommandSocketInfo;
+			try 
+			{
+				delete mpCommandSocketInfo;
+			}
+			catch(...)
+			{
+				::syslog(LOG_WARNING,
+					"Error closing command socket "
+					"after exception, ignored.");
+			}
 			mpCommandSocketInfo = 0;
 		}