Avoid errors from EntityBroker on an adhoc-group (#164)

(cherry picked from commit 9d2ae8c)
sakaicontrib · Dec 12, 2024 · 302ac71 · 302ac71
1 parent b83592d
commit 302ac71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sakai-evaluation-impl/src/java/org/sakaiproject/evaluation/logic/EvalCommonLogicImpl.java b/sakai-evaluation-impl/src/java/org/sakaiproject/evaluation/logic/EvalCommonLogicImpl.java
@@ -364,8 +364,8 @@ public EvalGroup makeEvalGroupObject(String evalGroupId) {
         }
 
         EvalGroup c = null;
-        if (c == null) {
-            // check external
+        if (!evalGroupId.startsWith(EvalAdhocGroup.ADHOC_ID_PREFIX)) {
+            // check external as long as it doesn't start with "adhoc-group:"
             c = externalLogic.makeEvalGroupObject(evalGroupId);
             if (c != null && EvalConstants.GROUP_TYPE_INVALID.equals(c.type)) {
                 c = null;

diff --git a/...tion-impl/src/java/org/sakaiproject/evaluation/logic/externals/EvalExternalLogicImpl.java b/...tion-impl/src/java/org/sakaiproject/evaluation/logic/externals/EvalExternalLogicImpl.java
@@ -609,13 +609,13 @@ else if (evalGroupId.startsWith(EvalConstants.GROUP_ID_SITE_PREFIX)) {
                 }
             } catch (Exception e) {
                 // invalid site reference
-                log.debug("Could not get sakai site from evalGroupId:" + evalGroupId, e);
+                log.debug("Could not get sakai site from evalGroupId:{}", evalGroupId, e);
                 c = null;
             }
         }
 
         if (c == null) {
-            log.debug("Could not get group from evalGroupId:" + evalGroupId);
+            log.debug("Could not get group from evalGroupId:{}", evalGroupId);
             // create a fake group placeholder as an error notice
             c = new EvalGroup( evalGroupId, "** INVALID: "+evalGroupId+" **", 
                     EvalConstants.GROUP_TYPE_INVALID );