Merge pull request #777 from leapmotion/ref-harmlesserr

Render `CreateInternal` exceptions harmless

src/autowiring/CoreContext.cpp

@@ -131,8 +131,8 @@ CoreContext::~CoreContext(void) {
 std::shared_ptr<CoreContext> CoreContext::CreateInternal(t_pfnCreate pfnCreate)
 {
   // don't allow new children if shutting down
-  if(IsShutdown())
-    throw autowiring_error("Cannot create a child context; this context is already shut down");
+  if (IsShutdown())
+    throw dispatch_aborted_exception("Cannot create a child context; this context is already shut down");
 
   t_childList::iterator childIterator;
   {

src/autowiring/test/CoreContextTest.cpp

@@ -543,3 +543,27 @@ TEST_F(CoreContextTest, InitiateAssertsSignals) {
   }
   ASSERT_TRUE(*teardown) << "Teardown handler not correctly notified on context teardown";
 }
+
+namespace {
+  class TriesToCreateChild :
+    public CoreThread
+  {
+  public:
+    TriesToCreateChild(void) :
+      CoreThread("TriesToCreateChild")
+    {}
+
+    void Run(void) override {
+      while (!ShouldStop());
+      AutoCreateContext();
+    }
+  };
+}
+
+TEST_F(CoreContextTest, TerminatedContextHarmless) {
+  AutoCurrentContext ctxt;
+  ctxt->Initiate();
+  AutoRequired<TriesToCreateChild>{};
+  ctxt->SignalShutdown();
+  ASSERT_THROW(ctxt->Create<void>(), dispatch_aborted_exception) << "An exception should have been thrown when attempting to create a child from a terminated context";
+}