Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check Scale connect status before acquiring lock #34

Merged
merged 3 commits into from
Feb 14, 2024
Merged

Check Scale connect status before acquiring lock #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59eb505
Check Scale connect status before acquiring lock
Feb 6, 2024
34990bc
changed log level
Feb 14, 2024
4b65180
changed marker
Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/target/devicemanager/components/scale/ScaleDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/target/devicemanager/components/scale/ScaleManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down