Fix RDS deployment error

Change-Id: Ic9422f9f904e0247081c30f6cfcce2dda483d5cf
Signed-off-by: cc1.yim <cc1.yim@samsung.com>

diff --git a/vcore/src/vcore/VCore.cpp b/vcore/src/vcore/VCore.cpp
index a3bbfee..b714773 100644 (file)
--- a/vcore/src/vcore/VCore.cpp
+++ b/vcore/src/vcore/VCore.cpp
@@ -82,7 +82,7 @@ bool VCoreInit(const std::string& configFilePath,
 {
     if(threadInterface) {
         LogDebug("Already Initialized");
-        return false;
+        return true;
     }
 
     threadInterface = new DPL::DB::ThreadDatabaseSupport(
@@ -95,10 +95,10 @@ bool VCoreInit(const std::string& configFilePath,
 
     LogDebug("Initializing VCore");
     Config &globalConfig = ConfigSingleton::Instance();
-    bool returnValue = globalConfig.setXMLConfigPath(configFilePath) &&
+    globalConfig.setXMLConfigPath(configFilePath) &&
         globalConfig.setXMLSchemaPath(configSchemaPath);
 
-    return returnValue;
+    return true;
 }
 
 void VCoreDeinit()

diff --git a/vcore/src/vcore/XmlsecAdapter.cpp b/vcore/src/vcore/XmlsecAdapter.cpp
index e41e1ed..dc89397 100644 (file)
--- a/vcore/src/vcore/XmlsecAdapter.cpp
+++ b/vcore/src/vcore/XmlsecAdapter.cpp
@@ -300,7 +300,7 @@ XmlSec::Result XmlSec::validateFile(XmlSecContext *context,
 
         n = m_pList->size();
 
-        char* pList[n+1];
+        char* pList[n];
         std::list<std::string>::const_iterator itr = m_pList->begin();
         std::string tmpString;
         char* uri = NULL;
@@ -396,6 +396,10 @@ XmlSec::Result XmlSec::validateFile(XmlSecContext *context,
     }
 
 done:
+    m_pList = NULL;
+    m_noHash = false;
+    m_partialHash = false;
+
     /*   cleanup */
     if (dsigCtx != NULL) {
         xmlSecDSigCtxDestroy(dsigCtx);