From 0f4acafeaefd8f395d6008e3da0be788ded4b149 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Fri, 17 Feb 2006 22:54:49 +0000 Subject: [PATCH] fixed mantis 239 --- src/ca/ca_client_context.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/ca/ca_client_context.cpp b/src/ca/ca_client_context.cpp index 1f5fca39a..f9109d3a3 100644 --- a/src/ca/ca_client_context.cpp +++ b/src/ca/ca_client_context.cpp @@ -78,15 +78,16 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) : } epicsThreadOnce ( & cacOnce, cacOnceFunc, 0 ); - - epicsGuard < epicsMutex > guard ( *ca_client_context::pDefaultServiceInstallMutex ); - if ( ca_client_context::pDefaultService ) { - this->pServiceContext.reset ( - & ca_client_context::pDefaultService->contextCreate ( - this->mutex, this->cbMutex, *this ) ); - } - else { - this->pServiceContext.reset ( new cac ( this->mutex, this->cbMutex, *this ) ); + { + epicsGuard < epicsMutex > guard ( *ca_client_context::pDefaultServiceInstallMutex ); + if ( ca_client_context::pDefaultService ) { + this->pServiceContext.reset ( + & ca_client_context::pDefaultService->contextCreate ( + this->mutex, this->cbMutex, *this ) ); + } + else { + this->pServiceContext.reset ( new cac ( this->mutex, this->cbMutex, *this ) ); + } } this->sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );