From 781e01535376b8bdf8ed11d5b4ae549a30d4f44d Mon Sep 17 00:00:00 2001 From: iadgovuser29 <33426478+iadgovuser29@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:14:48 -0400 Subject: [PATCH] Trying to change EL inheritance --- .../persist/entity/userdefined/rim/EventLogMeasurements.java | 2 +- .../persist/service/SupplyChainValidationService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/EventLogMeasurements.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/EventLogMeasurements.java index de990991..e361c5b7 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/EventLogMeasurements.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/rim/EventLogMeasurements.java @@ -27,7 +27,7 @@ import java.util.Collection; */ @Log4j2 @Entity -public class EventLogMeasurements extends ReferenceManifest { +public class EventLogMeasurements extends SupportReferenceManifest { @Column @JsonIgnore diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java index a4c82bbd..adc9e557 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/SupplyChainValidationService.java @@ -321,7 +321,7 @@ public class SupplyChainValidationService { deviceName)); } else { ReferenceManifest manifest = referenceManifestRepository - .findByHexDecHashAndRimType(sRim.getEventLogHash(), sRim.getRimType()); + .findByHexDecHashAndRimType(sRim.getEventLogHash(), ReferenceManifest.MEASUREMENT_RIM); if (manifest instanceof EventLogMeasurements) { eventLog = (EventLogMeasurements)manifest; }