Merge pull request #104 from n-riesco/patch-3

rgbkrk · web-flow · commit b310ab5de9b4 · 2016-11-25T08:04:58.000-08:00
Socket::Socket: Don't throw a C++ exception
diff --git a/binding.cc b/binding.cc
@@ -552,7 +552,8 @@ namespace zmq {
     size_t len = sizeof(uv_os_sock_t);
 
     if (zmq_getsockopt(socket_, ZMQ_FD, &socket, &len)) {
-      throw std::runtime_error(ErrorMessage());
+      Nan::ThrowError(ErrorMessage());
+      return;
     }
 
     #if ZMQ_CAN_MONITOR

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,8 @@ namespace zmq {`
`552`	`552`	`size_t len = sizeof(uv_os_sock_t);`
`553`	`553`
`554`	`554`	`if (zmq_getsockopt(socket_, ZMQ_FD, &socket, &len)) {`
`555`		`- throw std::runtime_error(ErrorMessage());`
	`555`	`+ Nan::ThrowError(ErrorMessage());`
	`556`	`+ return;`
`556`	`557`	`}`
`557`	`558`
`558`	`559`	`#if ZMQ_CAN_MONITOR`