From 1d274aba0dbdb6d7433024cb06995e2f11d87516 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 27 Apr 2012 13:21:43 -0400 Subject: [PATCH] Make dbChannel_create() call dbChannelOpen() --- src/ioc/db/dbContext.cpp | 6 ------ src/ioc/db/db_access.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ioc/db/dbContext.cpp b/src/ioc/db/dbContext.cpp index 99f257e7e..38c982f84 100644 --- a/src/ioc/db/dbContext.cpp +++ b/src/ioc/db/dbContext.cpp @@ -109,12 +109,6 @@ cacChannel & dbContext::createChannel ( // X aCC 361 throw cacChannel::unsupportedByService (); } - long status = dbChannelOpen ( dbch ); - if (status) { - dbChannelDelete ( dbch ); - throw cacChannel::notConnected (); - } - try { return * new ( this->dbChannelIOFreeList ) dbChannelIO ( this->mutex, notifyIn, dbch, *this ); diff --git a/src/ioc/db/db_access.c b/src/ioc/db/db_access.c index 3ac6660ff..b705e0b35 100644 --- a/src/ioc/db/db_access.c +++ b/src/ioc/db/db_access.c @@ -120,6 +120,12 @@ struct dbChannel * dbChannel_create(const char *pname) } chan->addr.dbr_field_type = dbDBRnewToDBRold[ftype]; + + if (dbChannelOpen(chan)) { + dbChannelDelete(chan); + return NULL; + } + return chan; }