fix for MID-6139 - reading shadows using debug pages when resource's …

…gone.
Evolveum · Mar 27, 2020 · 62dfd9a · 62dfd9a
1 parent 3c1bec9
commit 62dfd9a
Show file tree

Hide file tree

Showing 2 changed files with 3,210 additions and 3,190 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java b/.../src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
@@ -18,6 +18,7 @@
 import com.evolveum.midpoint.schema.RetrieveOption;
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -149,6 +150,9 @@ private ResourceDescription loadDescription(String oid, OperationResult result)
             }
 
             subResult.recordSuccess();
+        } catch (ObjectNotFoundException e) {
+            LoggingUtils.logException(LOGGER, "Resource with oid {} not found", e, oid);
+            result.recordPartialError(getPage().createStringResource("ObjectDataProvider.message.loadResourceForAccount.notFound", oid).getString());
         } catch (Exception ex) {
             LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load resource for account", ex);
             result.recordFatalError(getPage().createStringResource("ObjectDataProvider.message.loadResourceForAccount.fatalError").getString(), ex);
@@ -220,4 +224,9 @@ public String getType() {
             return type;
         }
     }
+
+    @Override
+    public boolean isUseCache() {
+        return false;
+    }
 }