Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Apr 2, 2020 · 7d2e273 · 7d2e273
2 parents e2f1fff + ce6cc36
commit 7d2e273
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...pl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RTaskWaitingReason.java b/...pl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RTaskWaitingReason.java
@@ -18,6 +18,9 @@ public enum RTaskWaitingReason implements SchemaEnum<TaskWaitingReasonType> {
 
     OTHER_TASKS(TaskWaitingReasonType.OTHER_TASKS),
 
+    // See MID-6117.
+    PLACEHOLDER(null),
+
     OTHER(TaskWaitingReasonType.OTHER);
 
     private TaskWaitingReasonType reason;

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
@@ -317,8 +317,9 @@ public static <T extends SchemaEnum> T getRepoEnumValue(Object object, Class<T>
         }
         Object[] values = type.getEnumConstants();
         for (Object value : values) {
+            //noinspection unchecked
             T schemaEnum = (T) value;
-            if (schemaEnum.getSchemaValue().equals(object)) {
+            if (object.equals(schemaEnum.getSchemaValue())) {
                 return schemaEnum;
             }
         }