From 23d2adf9226e1616749297d1894cab5b17190c7f Mon Sep 17 00:00:00 2001 From: Martin Weiler Date: Wed, 3 Jan 2024 12:48:35 -0700 Subject: [PATCH] [private-bamoe-issues#1326] Simplify the equals/hashCode methods --- .../core/timer/impl/GlobalTimerService.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java b/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java index 53bf42f823..a21ca9bee1 100644 --- a/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java +++ b/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java @@ -374,21 +374,16 @@ public String getUuid() { @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (int) (this.getId() ^ (this.getId() >>> 32)); - return result; + return (int)getId(); } @Override public boolean equals(Object obj) { if ( this == obj ) return true; - if ( obj == null ) return false; - if ( getClass() != obj.getClass() ) return false; - final DefaultJobHandle other = (DefaultJobHandle) obj; - if (this.getId() != other.getId()) - return false; - return true; + if (obj == null || !obj.getClass().equals(getClass())) { + return false; + } + return getId() == ((DefaultJobHandle)obj).getId(); } }