From 69cd06df3b501fab10e48d450d57ef35a84d9e35 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Tue, 9 Feb 2021 06:54:31 -0500
Subject: [PATCH] Merging error didn't include the update to Assert.State

---
 .../main/java/hirs/data/persist/info/ComponentInfo.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/info/ComponentInfo.java b/HIRS_Utils/src/main/java/hirs/data/persist/info/ComponentInfo.java
index 1805a13ca..4febbd67a 100644
--- a/HIRS_Utils/src/main/java/hirs/data/persist/info/ComponentInfo.java
+++ b/HIRS_Utils/src/main/java/hirs/data/persist/info/ComponentInfo.java
@@ -111,7 +111,9 @@ public ComponentInfo(final String componentManufacturer,
                 componentManufacturer,
                 componentModel,
                 componentSerial,
-                componentRevision));
+                componentRevision),
+                "ComponentInfo: manufacturer and/or "
+                        + "model can not be null");
         this.componentManufacturer = componentManufacturer.trim();
         this.componentModel = componentModel.trim();
         if (componentSerial != null) {
@@ -143,8 +145,9 @@ public ComponentInfo(final String componentManufacturer,
                 componentManufacturer,
                 componentModel,
                 componentSerial,
-                componentRevision
-        ));
+                componentRevision),
+                "ComponentInfo: manufacturer and/or "
+                        + "model can not be null");
         this.componentManufacturer = componentManufacturer.trim();
         this.componentModel = componentModel.trim();
         if (componentSerial != null) {