pinpoint-apm#1432 add null check for querying deleted agent infos

Xylus · Jan 14, 2016 · aa4b67c · aa4b67c
1 parent 60d7592
commit aa4b67c
Showing 1 changed file with 2 additions and 0 deletions.
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
@@ -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<AgentInfo> getAgentsByApplicationName(String applicationName, long ti
         if (unfilteredAgentInfos == null || unfilteredAgentInfos.isEmpty()) {
             return Collections.emptySet();
         }
+        CollectionUtils.filter(unfilteredAgentInfos, PredicateUtils.notNullPredicate());
         this.agentLifeCycleDao.populateAgentStatuses(unfilteredAgentInfos, timestamp);
         Set<AgentInfo> filteredAgentInfos = new HashSet<>();
         for (AgentInfo agentInfo : unfilteredAgentInfos) {