ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-21 22:07:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Cyrus 2021-02-09 06:54:31 -05:00
parent 5e4dc8ce82
commit 69cd06df3b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
HIRS_Utils/src/main/java/hirs/data/persist/info/ComponentInfo.java
View File

@ -111,7 +111,9 @@ public class ComponentInfo implements Serializable {
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 class ComponentInfo implements Serializable {
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) {