You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2007/06/06 04:06:54 UTC
svn commit: r544707 - in /incubator/uima/uimacpp/trunk/src: cas/cas.cpp
framework/annotator.cpp framework/resmgr.cpp
Author: eae
Date: Tue Jun 5 19:06:54 2007
New Revision: 544707
URL: http://svn.apache.org/viewvc?view=rev&rev=544707
Log:
UIMA-423 plug more framework leaks
Modified:
incubator/uima/uimacpp/trunk/src/cas/cas.cpp
incubator/uima/uimacpp/trunk/src/framework/annotator.cpp
incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp
Modified: incubator/uima/uimacpp/trunk/src/cas/cas.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/cas/cas.cpp?view=diff&rev=544707&r1=544706&r2=544707
==============================================================================
--- incubator/uima/uimacpp/trunk/src/cas/cas.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/cas/cas.cpp Tue Jun 5 19:06:54 2007
@@ -204,6 +204,7 @@
iv_sofaCount = 0;
isbaseCas = true;
iv_baseCas = this;
+ isDeletingViews = false;
bOwnsCASDefinition=false;
}
@@ -243,6 +244,7 @@
isbaseCas = false;
iv_baseCas = inCas;
bOwnsCASDefinition = false;
+ isDeletingViews = false;
}
CAS::CAS(uima::internal::CASDefinition & casDefs,
Modified: incubator/uima/uimacpp/trunk/src/framework/annotator.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/framework/annotator.cpp?view=diff&rev=544707&r1=544706&r2=544707
==============================================================================
--- incubator/uima/uimacpp/trunk/src/framework/annotator.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/framework/annotator.cpp Tue Jun 5 19:06:54 2007
@@ -387,6 +387,7 @@
UIMA_ANNOTATOR_TIMING(iv_clTimerDeInit.stop());
clTrace.dump(_TEXT("rc"), utRetVal);
/* at this point, the user data may not be used any more */
+ delete iv_hUserData;
iv_hUserData = 0;
return(utRetVal);
}
Modified: incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp?view=diff&rev=544707&r1=544706&r2=544707
==============================================================================
--- incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp Tue Jun 5 19:06:54 2007
@@ -724,9 +724,9 @@
// Terminate apr (undo matching apr_initialize)
apr_terminate();
-#if !defined( NDEBUG ) && defined(_MSC_VER) && defined(_CRTDBG_MAP_ALLOC)
- int iRetVal = _CrtDumpMemoryLeaks();
-#endif
+//#if !defined( NDEBUG ) && defined(_MSC_VER) && defined(_CRTDBG_MAP_ALLOC)
+// int iRetVal = _CrtDumpMemoryLeaks();
+//#endif
UIMA_TPRINT("ResMgr instance deleted");
}
assert( cv_pclSingletonInstance == 0 );