Fixed undefined behavior bug

Author: CodeByDrescher

IDAWin/SundialsSolverInterface.cpp

@@ -79,10 +79,7 @@ void activateSolver(std::ifstream& inputFileStream, FILE* outputFile, int taskID
 	}
 
 	// cleanup
-	if (SimulationMessaging::getInstVar() != nullptr) {
-		SimulationMessaging::getInstVar()->waitUntilFinished();
-		delete SimulationMessaging::getInstVar();
-	}
+	SimulationMessaging::cleanupInstanceVar();
 
 	if (!errorMsg.empty()) errExit(returnCode, errorMsg);
 }

IDAWin/VCellSolverFactory.cpp

@@ -109,12 +109,6 @@ VCellSolverInputBreakdown VCellSolverFactory::parseInputFile(std::ifstream& inpu
 		else throw VCell::Exception("Unexpected token \"" + nextToken + "\" in the input file!");
 
 	}
-
-
-	#ifdef USE_MESSAGING
-	// Since messaging assumes we have a job requiring messaging, we should initialize a "default" messaging handler
-	if (NULL == SimulationMessaging::getInstVar()) SimulationMessaging::create();
-	#endif
 	return inputBreakdown;
 }
 
@@ -469,8 +463,10 @@ static void loadJMSInfo(std::istream &ifsInput, int taskID) {
 	}
 
 	#ifdef USE_MESSAGING
-	SimulationMessaging::create(broker.c_str(), smqUserName.c_str(),
-								password.c_str(), qName.c_str(), topicName.c_str(),
-								vCellUsername.c_str(), simKey, jobIndex, taskID);
+	// SimulationMessaging::getInstVar()->initialize_curl_messaging(broker.c_str(), smqUserName.c_str(),
+	// 							password.c_str(), qName.c_str(), topicName.c_str(),
+	// 							vCellUsername.c_str(), simKey, jobIndex, taskID);
+	SimulationMessaging::getInstVar()->initialize_curl_messaging(false, broker.c_str(),
+		vCellUsername.c_str(), simKey, jobIndex, taskID);
 	#endif
 }

IDAWin/VCellSundialsSolver.cpp

@@ -615,7 +615,9 @@ double VCellSundialsSolver::getNextEventTime() {
 
 void VCellSundialsSolver::checkStopRequested(double time, long numIterations) {
 	#ifdef USE_MESSAGING
-	if (SimulationMessaging::getInstVar()->isStopRequested()) { throw StoppedByUserException("stopped by user"); }
+	auto instVar = SimulationMessaging::getInstVar();
+	if (nullptr == instVar) return;
+	if (instVar->isStopRequested()) { throw StoppedByUserException("stopped by user"); }
 	#endif
 }