diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoServiceImpl.java b/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoServiceImpl.java index 3283185c8931..a1e787a58875 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoServiceImpl.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoServiceImpl.java @@ -27,6 +27,7 @@ import com.navercorp.pinpoint.web.vo.ApplicationAgentHostList; import com.navercorp.pinpoint.web.vo.ApplicationAgentList; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.PredicateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -186,6 +187,7 @@ public Set getAgentsByApplicationName(String applicationName, long ti if (unfilteredAgentInfos == null || unfilteredAgentInfos.isEmpty()) { return Collections.emptySet(); } + CollectionUtils.filter(unfilteredAgentInfos, PredicateUtils.notNullPredicate()); this.agentLifeCycleDao.populateAgentStatuses(unfilteredAgentInfos, timestamp); Set filteredAgentInfos = new HashSet<>(); for (AgentInfo agentInfo : unfilteredAgentInfos) {