From ce7e6352912e594a0c76ea5354a62c8a503714ab Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 22 Mar 2024 21:21:57 -0400 Subject: [PATCH] check for errors --- reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java b/reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java index d763d55..7ff2475 100644 --- a/reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java +++ b/reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java @@ -99,8 +99,9 @@ public class DbcFile { private void purgePacket(DbcPacket currentPacket) { if (currentPacket != null) { - if (packets.containsKey(currentPacket.getId())) - throw new IllegalStateException("We already have " + packets.get(currentPacket.getId()).getName() + " for " + currentPacket.getId()); + DbcPacket existingPacket = packets.get(currentPacket.getId()); + if (existingPacket != null && existingPacket != currentPacket) + throw new IllegalStateException("We already have " + existingPacket.getName() + " for " + currentPacket.getId()); packets.put(currentPacket.getId(), currentPacket); } }