Fixes ZMQ startup with bad arguments.

mrbandrews · mrbandrews · commit 004011895930 · 2016-02-29T13:34:09.000-05:00
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
@@ -100,7 +100,6 @@ bool CZMQNotificationInterface::Initialize()
 
     if (i!=notifiers.end())
     {
-        Shutdown();
         return false;
     }
 
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
@@ -69,6 +69,7 @@ bool CZMQAbstractPublishNotifier::Initialize(void *pcontext)
         if (rc!=0)
         {
             zmqError("Failed to bind address");
+            zmq_close(psocket);
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,6 @@ bool CZMQNotificationInterface::Initialize()`
`100`	`100`
`101`	`101`	`if (i!=notifiers.end())`
`102`	`102`	`{`
`103`		`- Shutdown();`
`104`	`103`	`return false;`
`105`	`104`	`}`
`106`	`105`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ bool CZMQAbstractPublishNotifier::Initialize(void *pcontext)`
`69`	`69`	`if (rc!=0)`
`70`	`70`	`{`
`71`	`71`	`zmqError("Failed to bind address");`
	`72`	`+ zmq_close(psocket);`
`72`	`73`	`return false;`
`73`	`74`	`}`
`74`	`75`