diff --git a/readme.txt b/readme.txt index 8b45fd1..ac9419f 100644 --- a/readme.txt +++ b/readme.txt @@ -41,4 +41,5 @@ indexfile; 2015-07-06 1)handle wrong expr format like "aa&&bb" and "aa&bb&"; 2)iconv_convert performance optimized; 2015-10-19 check table_type in callback register; -2015-12-24 change plugin table update mechanism to save memory; \ No newline at end of file +2015-12-24 change plugin table update mechanism to save memory; +2016-01-20 maat_finish_cb adapt empty inc callback on a NULL scanner; diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 5a5585f..3fbbf62 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -24,7 +24,7 @@ #include "mesa_fuzzy.h" #include "great_index_engine.h" -int MAAT_FRAME_VERSION_1_3_20151224=1; +int MAAT_FRAME_VERSION_1_3_20160120=1; const char *maat_module="MAAT Frame"; const char* CHARSET_STRING[]={"CHARSET_NONE","GBK","BIG5","UNICODE","UTF-8"}; @@ -2258,7 +2258,7 @@ void maat_finish_cb(void* u_para) "Full config version %u load %d entries complete.", feather->update_tmp_scanner->version,feather->update_tmp_scanner->cfg_num); } - else + else if(feather->scanner!=NULL) { feather->scanner->cfg_num=total; feather->scanner->version=feather->maat_version; @@ -2275,7 +2275,7 @@ void maat_finish_cb(void* u_para) else { MESA_handle_runtime_log(feather->logger,RLOG_LV_INFO,maat_module, - "Postpone config version %u %d entries load to rulescan.", + "Postpone config version %u (%d entries) load to rulescan.", feather->scanner->version,feather->scanner->cfg_num); } }