This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 19960ff7f75c017ab15e3f2ec630927c99c33a5e Author: Marat Gubaidullin <[email protected]> AuthorDate: Fri Feb 27 18:38:56 2026 -0500 Fix Backend for 4.18.0 --- .../java/org/apache/camel/karavan/cache/KaravanCache.java | 1 + .../org/apache/camel/karavan/listener/ActivityListener.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCache.java b/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCache.java index 4495659e..318711f8 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCache.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCache.java @@ -480,6 +480,7 @@ public class KaravanCache { public Map<String, ActivityUser> getCopyUsersWorking() { return Map.copyOf(usersWorking); } + public void saveUserHeartBeat(ActivityUser activityUser) { usersHeartBeat.put(activityUser.getUserName(), activityUser); } diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/listener/ActivityListener.java b/karavan-app/src/main/java/org/apache/camel/karavan/listener/ActivityListener.java index 6cff2d7c..b9d4d3f4 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/listener/ActivityListener.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/listener/ActivityListener.java @@ -39,13 +39,13 @@ public class ActivityListener { @ConsumeEvent(value = ON_USER_ACTIVITY, ordered = true) public void onUserActivity(JsonObject json) { var activityUser = json.mapTo(ActivityUser.class); - if (Objects.isNull(activityUser)) { - } else if (ActivityUser.ActivityType.WORKING.equals(activityUser.getType())) { - karavanCache.saveUserWorking(activityUser); - } else { - karavanCache.saveUserHeartBeat(activityUser); + if (activityUser != null && activityUser.getUserName() != null) { + if (ActivityUser.ActivityType.WORKING.equals(activityUser.getType())) { + karavanCache.saveUserWorking(activityUser); + } else { + karavanCache.saveUserHeartBeat(activityUser); + } } - } @ConsumeEvent(value = ON_PROJECT_ACTIVITY, ordered = true)
