Changeset 19365 for gsdl

Timestamp:

2009-05-11T13:09:39+12:00 (15 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the bug that crashed server.exe when there's no MG built collection: mgsearch (and mgppsearch and lucenesearch) pointers weren't initialised to NULL in the constructors, yet they were tested against being NULL and then used.

Location:

gsdl/trunk/runtime-src/src/colservr

Files:

• collectset.cpp (modified) (2 diffs)
• collectset.h (modified) (1 diff)

gsdl/trunk/runtime-src/src/colservr/collectset.cpp

@@ -61 +61 @@
   text_tarray collections;
 
+  mgsearch = NULL;
+  mgppsearch = NULL;
+  lucenesearch = NULL;
+
   // get gsdlhome (if we fail the error will be picked up later -- in
   // cgiwrapper)
@@ -95 +99 @@
 {
   httpprefix = httpprefix_arg;
-}
-
+
+  mgsearch = NULL;
+  mgppsearch = NULL;
+  lucenesearch = NULL;
+
+}
+
+collectset::collectset ()
+{
+  mgsearch = NULL;
+  mgppsearch = NULL;
+  lucenesearch = NULL;
+}
 
 collectset::~collectset () {

gsdl/trunk/runtime-src/src/colservr/collectset.h

@@ -32 +32 @@
 
   // this constructor is used by the local library
-  collectset() {}
+  collectset();
 
   ~collectset();