From d52d8cf5d4af1345a4395c493730fcd7a5eb5065 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 6 Feb 2019 21:00:39 -0800
Subject: [PATCH] pva/server.h allow createChannel() to return NULL

---
 src/server/server.cpp        | 2 ++
 src/server/serverContext.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/server.cpp b/src/server/server.cpp
index 7e64650..ac00762 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -242,6 +242,8 @@ struct DynamicProvider::Impl : public pva::ChannelProvider
         pvd::Status sts;
 
         ret = handler->createChannel(ChannelProvider::shared_pointer(internal_self), name, requester);
+        if(!ret)
+            sts = pvd::Status::error("Channel no longer available"); // because we only get here if channelFind() succeeds
 
         requester->channelCreated(sts, ret);
         return ret;
diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp
index f10c338..b613bb3 100644
--- a/src/server/serverContext.cpp
+++ b/src/server/serverContext.cpp
@@ -183,7 +183,7 @@ void ServerContextImpl::loadConfiguration()
     }
 
     if(_channelProviders.empty())
-        LOG(logLevelError, "ServerContext configured with not Providers will do nothing!\n");
+        LOG(logLevelError, "ServerContext configured with no Providers will do nothing!\n");
 
     //
     // introspect network interfaces