Make dbChannel_create() call dbChannelOpen()

This commit is contained in:
Andrew Johnson authored and Michael Davidsaver committed 2012-04-27 13:21:43 -04:00
1 parent b4dbcf2b1a
commit 1d274aba0d
2 files changed
+6 -6

No files matched your search

-6
View File
@@ -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 );
+6
View File
@@ -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;
}