Merge pull request #638 from UWB-Biocomputing/issue-270-handle-nullptr-from-factory

[ISSUE 270] Handle Nullptr From Factory

Author: Oelgazz

Simulator/Core/Model.cpp

@@ -2,15 +2,15 @@
  * @file Model.cpp
  *
  * @ingroup Simulator/Core
- * 
+ *
  * @brief Implementation of Model for the graph-based networks.
  *
  * The network is composed of 3 superimposed 2-d arrays: vertices, edges, and
  * summation points.
  *
  * Edges in the edge map are located at the coordinates of the vertex
  * from which they receive output.  Each edge stores a pointer into a
- * summation point. 
+ * summation point.
  */
 
 #include "Model.h"
@@ -23,21 +23,42 @@
 /// Constructor
 Model::Model()
 {
+   // Get a copy of the console logger to use in the case of errors
+   log4cplus::Logger consoleLogger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("console"));
+
    // Reference variable used to get class type from ParameterManager.
    string type;
 
    // Create Layout class using type definition from configuration file.
    ParameterManager::getInstance().getStringByXpath("//LayoutParams/@class", type);
    layout_ = Factory<Layout>::getInstance().createType(type);
 
+   // If the factory returns an error (nullptr), exit
+   if (layout_ == nullptr) {
+      LOG4CPLUS_INFO(consoleLogger, "INVALID CLASS: " + type);
+      exit(EXIT_FAILURE);
+   }
+
    // Create Connections class using type definition from configuration file.
    ParameterManager::getInstance().getStringByXpath("//ConnectionsParams/@class", type);
    connections_ = Factory<Connections>::getInstance().createType(type);
 
+   // If the factory returns an error (nullptr), exit
+   if (connections_ == nullptr) {
+      LOG4CPLUS_INFO(consoleLogger, "INVALID CLASS: " + type);
+      exit(EXIT_FAILURE);
+   }
+
    // Create Recorder class using type definition from configuration file.
    ParameterManager::getInstance().getStringByXpath("//RecorderParams/@class", type);
    recorder_ = Factory<Recorder>::getInstance().createType(type);
 
+   // If the factory returns an error (nullptr), exit
+   if (recorder_ == nullptr) {
+      LOG4CPLUS_INFO(consoleLogger, "INVALID CLASS: " + type);
+      exit(EXIT_FAILURE);
+   }
+
    // Get a copy of the file logger to use log4cplus macros
    fileLogger_ = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("file"));
 }

Simulator/Core/Simulator.cpp

@@ -94,6 +94,12 @@ void Simulator::loadParameters()
    ParameterManager::getInstance().getStringByXpath("//RNGConfig/NoiseRNGSeed/@class", type);
    noiseRNG = Factory<MTRand>::getInstance().createType(type);
 
+   // If the factory returns an error (nullptr), exit
+   if (noiseRNG == nullptr) {
+      LOG4CPLUS_INFO(consoleLogger_, "INVALID CLASS: " + type);
+      exit(EXIT_FAILURE);
+   }
+
    ParameterManager::getInstance().getLongByXpath("//RNGConfig/InitRNGSeed/text()", initRngSeed_);
    ParameterManager::getInstance().getLongByXpath("//RNGConfig/NoiseRNGSeed/text()", noiseRngSeed_);
    noiseRNG->seed(noiseRngSeed_);

Simulator/Layouts/Layout.cpp

@@ -19,11 +19,20 @@
 /// Constructor
 Layout::Layout() : numEndogenouslyActiveNeurons_(0)
 {
+   // Get a copy of the console logger to use in the case of errors
+   log4cplus::Logger consoleLogger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("console"));
+
    // Create Vertices/Neurons class using type definition in configuration file
    string type;
    ParameterManager::getInstance().getStringByXpath("//VerticesParams/@class", type);
    vertices_ = Factory<AllVertices>::getInstance().createType(type);
 
+   // If the factory returns an error (nullptr), exit
+   if (vertices_ == nullptr) {
+      LOG4CPLUS_INFO(consoleLogger, "INVALID CLASS: " + type);
+      exit(EXIT_FAILURE);
+   }
+
    // Register loadParameters function as a loadParameters operation in the Operation Manager
    function<void()> loadParametersFunc = std::bind(&Layout::loadParameters, this);
    OperationManager::getInstance().registerOperation(Operations::op::loadParameters,