Merging error didn't include the update to Assert.State

nsacyber · Feb 9, 2021 · 69cd06d · 69cd06d
1 parent 5e4dc8c
commit 69cd06d
Showing 1 changed file with 6 additions and 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
@@ -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) {