Merge pull request #34 from target/nonScale_changes

Check Scale connect status before acquiring lock
target · Feb 14, 2024 · 0a213c1 · 0a213c1
2 parents 6a4421f + 4b65180
commit 0a213c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java b/src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java
@@ -203,9 +203,9 @@ void startStableWeightRead(int timeout) {
                         return;
                 } catch (JposException jposException) {
                     if(isConnected()) {
-                        LOGGER.error(MARKER, "Scale Failed to Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended());
+                        LOGGER.trace("Scale Failed to Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended());
                     } else {
-                        LOGGER.error(MARKER, "Scale not connected in Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended());
+                        LOGGER.trace("Scale not connected in Read Stable Weight: " + jposException.getErrorCode() + ", " + jposException.getErrorCodeExtended());
                     }
                     if(jposException.getErrorCode() != JposConst.JPOS_E_TIMEOUT) {
                         fireScaleWeightErrorEvent(jposException);

diff --git a/src/main/java/com/target/devicemanager/components/scale/ScaleManager.java b/src/main/java/com/target/devicemanager/components/scale/ScaleManager.java
@@ -113,7 +113,7 @@ void subscribeToLiveWeight(SseEmitter liveWeightEmitter) throws IOException {
     }
 
     public FormattedWeight getStableWeight(CompletableFuture<FormattedWeight> stableWeightClient) throws ScaleException {
-        if (scaleDevice.tryLock() && isScaleReady()) {
+        if (isScaleReady() && scaleDevice.tryLock()) {
             //Create new future and add it to the list
             stableWeightClients.add(stableWeightClient);
             scaleDevice.startStableWeightRead(STABLE_WEIGHT_TIMEOUT_MSEC);