commit cb4ce7ffb035a9a824bcae7d2ae8610cde563590
author Linux Build Service Account <lnxbuild@localhost> Fri May 03 01:34:07 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 03 01:34:07 2013 -0700
tree 7aea5d73b85191dd25348f0e2fa9d10638657389
parent d26fca09418ade89d3230c70b85ad6e56997f4b2
parent 9cf6a54b58a884f0d42e59764c389c84f8688b4a

Merge "Create IPACM_ConntrackClient instance as part of global variable initialization to avoid race conditions"

ipacm/src/IPACM_ConntrackClient.cpp

diff --git a/ipacm/src/IPACM_ConntrackClient.cpp b/ipacm/src/IPACM_ConntrackClient.cpp
index 6854881..355a3c7 100644
--- a/ipacm/src/IPACM_ConntrackClient.cpp
+++ b/ipacm/src/IPACM_ConntrackClient.cpp
@@ -45,7 +45,7 @@
 
 extern IPACM_EvtDispatcher cm_dis;
 
-IPACM_ConntrackClient *IPACM_ConntrackClient::pInstance = NULL;
+IPACM_ConntrackClient *IPACM_ConntrackClient::pInstance = IPACM_ConntrackClient::GetInstance();
 IPACM_ConntrackListener *ct = new IPACM_ConntrackListener();
 
 /* ================================