Mercurial > hg > orthanc
diff OrthancServer/main.cpp @ 3049:6a2c7e206ebb db-changes
integration mainline->db-changes
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 20 Dec 2018 16:18:38 +0100 |
parents | e3b5c07146a3 8b331be57606 |
children | ce272138f15e |
line wrap: on
line diff
--- a/OrthancServer/main.cpp Thu Dec 20 16:06:38 2018 +0100 +++ b/OrthancServer/main.cpp Thu Dec 20 16:18:38 2018 +0100 @@ -356,11 +356,13 @@ const IHttpHandler::Arguments& httpHeaders, const IHttpHandler::GetArguments& getArguments) { +#if ORTHANC_ENABLE_PLUGINS == 1 if (plugins_ != NULL && !plugins_->IsAllowed(method, uri, ip, username, httpHeaders, getArguments)) { return false; } +#endif static const char* HTTP_FILTER = "IncomingHttpRequestFilter"; @@ -1232,8 +1234,12 @@ #elif ORTHANC_ENABLE_PLUGINS == 0 // The plugins are disabled - databasePtr.reset(lock.GetConfiguration().CreateDatabaseWrapper()); - storage.reset(lock.GetConfiguration().CreateStorageArea()); + + databasePtr.reset(CreateDatabaseWrapper()); + storage.reset(CreateStorageArea()); + + assert(databasePtr.get() != NULL); + assert(storage.get() != NULL); return ConfigureDatabase(*databasePtr, *storage, NULL, upgradeDatabase, loadJobsFromDatabase);