From 547fbc6e9141a514a04eafb36e866292ca68d6c5 Mon Sep 17 00:00:00 2001 From: skidder Date: Wed, 11 Dec 2002 16:31:18 +0000 Subject: [PATCH] Temporary hack to make engine work until new configuration manager be able to handle directories stuff --- src/jrd/isc.cpp | 3 ++- src/jrd/jrd.cpp | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/jrd/isc.cpp b/src/jrd/isc.cpp index 29b493b65b..ad1d501546 100644 --- a/src/jrd/isc.cpp +++ b/src/jrd/isc.cpp @@ -36,7 +36,7 @@ * */ /* -$Id: isc.cpp,v 1.23 2002-12-10 11:53:49 eku Exp $ +$Id: isc.cpp,v 1.24 2002-12-11 16:31:15 skidder Exp $ */ #ifdef DARWIN #define _STLP_CCTYPE @@ -557,6 +557,7 @@ void DLL_EXPORT ISC_get_config(TEXT * config_file, IPCCFG config_table) /* The master configuration options are in memory, now for this request for option values mark each one as not found and search the memory table for each one. */ + if (!config_table) return; for (h = config_table; h->ipccfg_keyword; h++) { diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp index d19d2c33b9..d54139daec 100644 --- a/src/jrd/jrd.cpp +++ b/src/jrd/jrd.cpp @@ -5578,6 +5578,10 @@ static DBB init(TDBB tdbb, gds__register_cleanup(cleanup, 0); initialized = TRUE; JRD_cache_default = Config::getDefaultDbCachePages(); + // 11 Dec 2002 Nickolay Samofatov. This is a temporary hack to make old // + // configuration manager generate default directories parameters // + ISC_get_config(LOCK_HEADER, NULL); + /////////////////////////////////////////////////////////////////////////// if (JRD_cache_default < MIN_PAGE_BUFFERS) JRD_cache_default = MIN_PAGE_BUFFERS; if (JRD_cache_default > MAX_PAGE_BUFFERS)