From: Allan Cornet Date: Tue, 19 Aug 2008 04:16:33 +0000 (+0000) Subject: free ClassPathxmlDocPtr @ exit X-Git-Tag: 5.0-rc1~15 X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=06cae0e61f194701f7eece8c1fa479e50513e63b free ClassPathxmlDocPtr @ exit --- diff --git a/scilab/modules/jvm/src/c/TerminateJVM.c b/scilab/modules/jvm/src/c/TerminateJVM.c index 22c00d3..6eba068 100644 --- a/scilab/modules/jvm/src/c/TerminateJVM.c +++ b/scilab/modules/jvm/src/c/TerminateJVM.c @@ -15,9 +15,11 @@ #include "TerminateJVM.h" #include "JVM.h" #include "createMainScilabObject.h" +#include "loadClasspath.h" /*--------------------------------------------------------------------------*/ BOOL TerminateJVM(void) { + freeClassPathxmlDocPtr(); finishMainScilabObject(); return finishJVM(); } diff --git a/scilab/modules/jvm/src/c/loadClasspath.c b/scilab/modules/jvm/src/c/loadClasspath.c index efba246..8614271 100644 --- a/scilab/modules/jvm/src/c/loadClasspath.c +++ b/scilab/modules/jvm/src/c/loadClasspath.c @@ -37,6 +37,15 @@ xmlDocPtr getClassPathxmlDocPtr(void) return ClassPathxmlDocPtr; } /*--------------------------------------------------------------------------*/ +void freeClassPathxmlDocPtr(void) +{ + if (ClassPathxmlDocPtr) + { + xmlFreeDoc (ClassPathxmlDocPtr); + ClassPathxmlDocPtr = NULL; + } +} +/*--------------------------------------------------------------------------*/ BOOL LoadClasspath(char *xmlfilename) { BOOL bOK = FALSE; diff --git a/scilab/modules/jvm/src/c/loadClasspath.h b/scilab/modules/jvm/src/c/loadClasspath.h index 52eb4cd..ba4032f 100644 --- a/scilab/modules/jvm/src/c/loadClasspath.h +++ b/scilab/modules/jvm/src/c/loadClasspath.h @@ -33,5 +33,10 @@ BOOL LoadClasspath(char *xmlfilename); */ xmlDocPtr getClassPathxmlDocPtr(void); +/** +* free xmlDocPtr of classpath.xml +*/ +void freeClassPathxmlDocPtr(void); + #endif /* __LOADCLASSPATH_H__ */ /*--------------------------------------------------------------------------*/