From abada90e3f84dc703b8ddc9efcbed8a946fadead Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Thu, 1 Feb 2007 17:09:49 +0000 Subject: Expanded tabs into spaces --- cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc | 82 +++++++++++----------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc') diff --git a/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc index 862196b8718..35e27fc3749 100644 --- a/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc +++ b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc @@ -38,7 +38,7 @@ class Notification : public Ice::ThreadNotification public: Notification(size_t index) : - _index(index) + _index(index) { } @@ -48,35 +48,35 @@ public: virtual void stop() { - if(_current != 0 && _index < _current->size()) - { + if(_current != 0 && _index < _current->size()) + { #ifdef TRACE - cerr << "Disconnecting from Oracle in thread " << IceUtil::ThreadControl().id() << endl; + cerr << "Disconnecting from Oracle in thread " << IceUtil::ThreadControl().id() << endl; #endif - EXEC SQL BEGIN DECLARE SECTION; - sql_context ctx = (*_current)[_index]; - EXEC SQL END DECLARE SECTION; - - if(ctx != 0) - { - (*_current)[_index] = 0; - EXEC SQL CONTEXT USE :ctx; - - sqlca sqlca; - EXEC SQL ROLLBACK RELEASE; - EXEC SQL CONTEXT FREE :ctx; - } - - if(find_if(_current->begin(), _current->end(), bind2nd(not_equal_to(), static_cast(0))) - == _current->end()) - { + EXEC SQL BEGIN DECLARE SECTION; + sql_context ctx = (*_current)[_index]; + EXEC SQL END DECLARE SECTION; + + if(ctx != 0) + { + (*_current)[_index] = 0; + EXEC SQL CONTEXT USE :ctx; + + sqlca sqlca; + EXEC SQL ROLLBACK RELEASE; + EXEC SQL CONTEXT FREE :ctx; + } + + if(find_if(_current->begin(), _current->end(), bind2nd(not_equal_to(), static_cast(0))) + == _current->end()) + { #ifdef TRACE - cerr << "Deleting _current in thread " << IceUtil::ThreadControl().id() << endl; + cerr << "Deleting _current in thread " << IceUtil::ThreadControl().id() << endl; #endif - delete _current; - _current = 0; - } - } + delete _current; + _current = 0; + } + } } private: @@ -90,8 +90,8 @@ CurrentSqlContext::CurrentSqlContext(const string& connectInfo) : _connectInfo(connectInfo) { { - IceUtil::StaticMutex::Lock lock(IceUtil::globalMutex); - _index = _currentIndex++; + IceUtil::StaticMutex::Lock lock(IceUtil::globalMutex); + _index = _currentIndex++; } _hook = new Notification(_index); } @@ -106,11 +106,11 @@ CurrentSqlContext::operator sql_context() const { if(_current == 0) { - _current = new std::vector(_index + 1); + _current = new std::vector(_index + 1); } if(_index >= _current->size()) { - _current->resize(_index + 1); + _current->resize(_index + 1); } EXEC SQL BEGIN DECLARE SECTION; @@ -123,18 +123,18 @@ CurrentSqlContext::operator sql_context() const if(ctx == 0) { #ifdef TRACE - cerr << "Connecting to Oracle in thread " << IceUtil::ThreadControl().id() << endl; + cerr << "Connecting to Oracle in thread " << IceUtil::ThreadControl().id() << endl; #endif - // - // Allocate and connect - // - sqlca sqlca; - - EXEC SQL CONTEXT ALLOCATE :ctx; - EXEC SQL CONTEXT USE :ctx; - EXEC SQL CONNECT :connectInfo; - - (*_current)[_index] = ctx; + // + // Allocate and connect + // + sqlca sqlca; + + EXEC SQL CONTEXT ALLOCATE :ctx; + EXEC SQL CONTEXT USE :ctx; + EXEC SQL CONNECT :connectInfo; + + (*_current)[_index] = ctx; } return ctx; -- cgit v1.2.3