Merge pull request #206 from SoftwareDesignLab/versioning-enhancement…

…s-job-merge null db fix in mitre
SoftwareDesignLab · Nov 30, 2023 · cdeda01 · cdeda01
2 parents a9edeb6 + c947423
commit cdeda01
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/reconciler/src/main/java/edu/rit/se/nvip/ReconcilerMain.java b/reconciler/src/main/java/edu/rit/se/nvip/ReconcilerMain.java
@@ -67,19 +67,21 @@ public static void main(String[] args) throws Exception {
                 Reconciler reconciler = ReconcilerFactory.createReconciler(ReconcilerEnvVars.getReconcilerType());
                 reconciler.setKnownCveSources(ReconcilerEnvVars.getKnownSourceMap());
 
-                NvdCveController nvdController = new NvdCveController();
-                nvdController.createDatabaseInstance();
-
-                MitreCveController mitreController = new MitreCveController();
-                mitreController.initializeController();
-
                 DataSource ds = DatabaseHelper.getInstance().getDataSource();
                 RawDescriptionRepository rawRepo = new RawDescriptionRepository(ds);
                 VulnerabilityRepository vulnRepo = new VulnerabilityRepository(ds);
                 CharacterizationRepository charRepo = new CharacterizationRepository(ds);
                 NvdMitreRepository nmRepo = new NvdMitreRepository(ds);
                 RunHistoryRepository rhRepo = new RunHistoryRepository(ds);
 
+                NvdCveController nvdController = new NvdCveController();
+                nvdController.createDatabaseInstance();
+
+                MitreCveController mitreController = new MitreCveController();
+                mitreController.setDatabaseHelper(nmRepo);
+                mitreController.initializeController();
+
+
                 ReconcilerController rc = new ReconcilerController(rawRepo, vulnRepo, charRepo, nmRepo, rhRepo, filterHandler, reconciler, nvdController, mitreController);
 
                 Messenger messenger = new Messenger(connectionFactory, inputQueueName, outputQueueName, rc);