[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] tools/dtdriver/engine ffdriver.cpp, 1.39.2.24.10.1,
From:       xzhao () helixcommunity ! org
Date:       2011-01-24 2:22:59
Message-ID: 201101240223.p0O2NAWQ027444 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/tools/dtdriver/engine
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv26780

Modified Files:
      Tag: hxclient_3_6_2_atlas
	ffdriver.cpp 
Log Message:
Merge from 361Atlas for issue 12584 on U1, below is the original commit log on 361Atlas:
bug fix 9760: Low memory and media scanner died. CR: ehyche@real.com and sfu@real.com
The logic to release m_pContext is revoked back to its original (as seen in earlier
version of ffdriver.cpp 1.39.2.19)


Index: ffdriver.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/ffdriver.cpp,v
retrieving revision 1.39.2.24.10.1
retrieving revision 1.39.2.24.10.2
diff -u -d -r1.39.2.24.10.1 -r1.39.2.24.10.2
--- ffdriver.cpp	24 Aug 2010 01:38:37 -0000	1.39.2.24.10.1
+++ ffdriver.cpp	24 Jan 2011 02:22:56 -0000	1.39.2.24.10.2
@@ -391,7 +391,11 @@
 	HX_RELEASE(m_pScheduler);
 	HX_RELEASE(m_pClientContext);
 	HX_RELEASE(m_pErrorMessages);
-        HX_RELEASE(m_pContext);
+        if (m_pContext)
+        {
+            m_pContext->Destruct();
+            m_pContext = NULL;
+        }
     }
 }
 
@@ -1548,7 +1552,11 @@
                 {
 		    HX_RELEASE(m_pScheduler);
                     HX_RELEASE(m_pErrorMessages);
-                    HX_RELEASE(m_pContext);
+                    if (m_pContext)
+                    {
+                        m_pContext->Destruct();
+                        m_pContext = NULL;
+                    }
                 }
 
                 MEMPROBE_FREEZE(MEMPRB_TOTAL);


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]