TSG-7949, sapp频繁输出的重复告警日志改成field stat统计;

TSG-8118, 修复sapp解析配置文件etc/well_known_port.conf错误;

2 files changed, 6 insertions, 0 deletions

diff --git a/src/sapp_dev/sapp_global_val.c b/src/sapp_dev/sapp_global_val.c
index 4a23ec4..8cda235 100644
--- a/src/sapp_dev/sapp_global_val.c
+++ b/src/sapp_dev/sapp_global_val.c
@@ -333,6 +333,7 @@ void sapp_gval_destroy(void)
 
 	memset((void *)sapp_global_val, 0xFE, sizeof(sapp_global_t));
 	free(sapp_global_val);
+	sapp_global_val = NULL;
 }
 
 
diff --git a/src/sapp_dev/sapp_plug.c b/src/sapp_dev/sapp_plug.c
index 87a577d..9b1e84c 100644
--- a/src/sapp_dev/sapp_plug.c
+++ b/src/sapp_dev/sapp_plug.c
@@ -213,6 +213,11 @@ void libsapp_destroy_env(void)
 		MESA_ATOMIC_SET(g_destory_env_done, 1);
 	}
 
+	if(NULL == sapp_global_val){
+		/* �����Ѿ����ù�libsapp_destroy_env(), ����libsapp_setup_env()ʧ���� */
+		return;
+	}
+
 	if(CAP_MODEL_PCAP_DUMPFILE == g_packet_io_cap_mode){
 		exit_process = 1;
 	}