Merge branch 'develop' into stable

2024-07-15 15:36:22 -04:00
parent 8945bd569b af8025237b
commit 3a3aa83128
1 changed files with 7 additions and 1 deletions
--- a/src/main/java/com/inteligr8/alfresco/activiti/share/ModelShareWorker.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/share/ModelShareWorker.java
@@ -419,7 +419,13 @@ public class ModelShareWorker implements Bootstrappable {
        
        @Override
        public boolean equals(Object obj) {
-            return this.group.getId().equals(((Group) obj).getId());
+            if (obj instanceof HashableGroup) {
+                return this.group.getId().equals(((HashableGroup) obj).getGroup().getId());
+            } else if (obj instanceof Group) {
+                return this.group.getId().equals(((Group) obj).getId());
+            } else {
+                return false;
+            }
        }
        
        @Override