diff options
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index b4f5e305598..f4e8d5f5c17 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -15,7 +15,7 @@ #include <Ice/Ice.h> #include <Ice/DynamicLibrary.h> #include <IceBox/ServiceManagerI.h> -#include <Freeze/Initialize.h> +#include <Freeze/DBException.h> using namespace Ice; using namespace IceBox; @@ -311,9 +311,9 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, // FreezeServicePtr fs = FreezeServicePtr::dynamicCast(info.service); - info.dbEnv = ::Freeze::initialize(communicator, properties->getProperty("IceBox.DBEnvName." + service)); + info.envName = properties->getProperty("IceBox.DBEnvName." + service); - fs->start(service, communicator, serviceArgs, info.dbEnv); + fs->start(service, communicator, serviceArgs, info.envName); } info.library = library; @@ -372,20 +372,6 @@ IceBox::ServiceManagerI::stopAll() Warning out(_logger); out << "ServiceManager: unknown exception in stop for service " << p->first; } - - if(info.dbEnv) - { - try - { - info.dbEnv->sync(); - } - catch(const Ice::Exception& ex) - { - Warning out(_logger); - out << "ServiceManager: exception in stop for service " << p->first << ":\n"; - out << ex; - } - } } for(p = _services.begin(); p != _services.end(); ++p) @@ -407,21 +393,6 @@ IceBox::ServiceManagerI::stopAll() } } - if(info.dbEnv) - { - try - { - info.dbEnv->close(); - info.dbEnv = 0; - } - catch(const Ice::Exception& ex) - { - Warning out(_logger); - out << "ServiceManager: exception in stop for service " << p->first << ":\n"; - out << ex; - } - } - // // Release the service, the service communicator and then the library. The order is important, // the service must be released before destroying the communicator so that the communicator |