Changeset 11021 for trunk/gsdl3

Timestamp:

2005-12-21T13:56:45+13:00 (18 years ago)

Author:

kjdon

Message:

asserts if they fail kill tomcat, so changed some asserts to if statements

File:

• trunk/gsdl3/src/packages/mg/jni/MGWrapperImpl.c (modified) (5 diffs)

trunk/gsdl3/src/packages/mg/jni/MGWrapperImpl.c

@@ -374 +374 @@
 
   jthrowable exc;
-
   /* First of all, clear the previous result */
   /* The result to write to */
@@ -390 +389 @@
   /* Make sure an index has been specified */
   index_path = data->queryInfo->index;
-  assert(index_path != NULL);
+  if (index_path == NULL) {
+    return;
+  }
 
   /* Obtain C versions of the two string parameters */
@@ -414 +415 @@
     return;
   }
-  /*assert(qd != NULL);*/
-
+  
   /* Remove anything hanging around from last time */
   FreeQueryDocs(qd);
@@ -421 +421 @@
   /* Obtain a C version of the query string */
   query = (char*) (*j_env)->GetStringUTFChars(j_env, j_query, NULL);
-  assert(query != NULL);
+  if (query == NULL) {
+    return;
+  }
   printf("Searching for query \"%s\"...\n", query);
 
@@ -471 +473 @@
 
   /* Check the query was processed successfully */
-  assert(qd->DL != NULL);
-  assert(qd->QTL != NULL);
-  assert(qd->TL != NULL);
+  if (qd->DL == NULL || qd->QTL == NULL || qd->TL == NULL) {
+    return;
+  }
 
   /* Record the total number of matching documents */