Make dbChannel_create() call dbChannelOpen()
This commit is contained in:
committed by
Michael Davidsaver
parent
b4dbcf2b1a
commit
1d274aba0d
@@ -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 );
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user