From 83427b607498c47b4827406490199e3566656252 Mon Sep 17 00:00:00 2001 From: Graham Wood Date: Sat, 5 Sep 2020 17:35:47 +0100 Subject: [PATCH] improve exception handling messages, update Jar --- Software/deployment/PowerMonitor.jar | Bin 64977 -> 65026 bytes .../packets/STM8PacketCollector.java | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Software/deployment/PowerMonitor.jar b/Software/deployment/PowerMonitor.jar index 5bd6d08736fcc4722035a84dc4e34227459c7455..ffb86560618831d9e73f85b43a83ca906b60c040 100644 GIT binary patch delta 3895 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 S^*>3Es=Z($<=!H=KK}>ipn!J( delta 3844 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 diff --git a/Software/src/main/java/org/ladbury/powerMonitor/packets/STM8PacketCollector.java b/Software/src/main/java/org/ladbury/powerMonitor/packets/STM8PacketCollector.java index 9e1a0f0..13cde46 100644 --- a/Software/src/main/java/org/ladbury/powerMonitor/packets/STM8PacketCollector.java +++ b/Software/src/main/java/org/ladbury/powerMonitor/packets/STM8PacketCollector.java @@ -92,7 +92,7 @@ public void run() e.printStackTrace(); if (this.bytes == null) { this.bytes = new ArrayList<>(); - System.err.println( "Null bytes in STM8PacketCollector"); + System.err.println( "Null 'this.bytes' in STM8PacketCollector, recreated"); } } //accumulate packets for the period (assume top half of while is short time) @@ -119,7 +119,9 @@ private Collection extractPackets(Collection rawData)throws NullPo /* Unbox Byte array to byte array */ byte[] data = new byte[rawData.size()]; - for(Byte b: rawData) if(b!=null) data[dataIdx++] = b; + for(Byte b: rawData) + if(b!=null) data[dataIdx++] = b; + else System.err.println( "Null b in STM8PacketCollector"); /* Reset index */ dataIdx = 0;