diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/service/ConfigurableStatisticsService.java b/platform/platform-impl/src/com/intellij/internal/statistic/service/ConfigurableStatisticsService.java index dd0ddec55cfd..fdaaf30d528c 100755 --- a/platform/platform-impl/src/com/intellij/internal/statistic/service/ConfigurableStatisticsService.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/service/ConfigurableStatisticsService.java @@ -36,7 +36,7 @@ public abstract class ConfigurableStatisticsService { private static final Logger LOG = Logger.getInstance("com.intellij.internal.statistic.service.whiteList.FUStatisticsService"); @@ -28,16 +29,27 @@ public class FUStatisticsService extends ConfigurableStatisticsService approvedGroups = mySettingsService.getApprovedGroups(); + if (approvedGroups.isEmpty()) { + throw new StatServiceException("There are no approved collectors or Statistics White List Service is unavailable."); + } + FSContent allDataFromCollectors = myAggregator.getUsageCollectorsData(approvedGroups); + if (allDataFromCollectors == null) { + throw new StatServiceException("There are no data from collectors to send"); + } try { String dataToSend = FUStatisticsStateService.create().getMergedDataToSend(allDataFromCollectors.asJsonString()); - if (dataToSend == null) return null; + if (dataToSend == null) { + throw new StatServiceException("There are no data from collectors to send"); + } HttpResponse response = postStatistics(serviceUrl, dataToSend); diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/service/old/OldConfigurableStatisticsService.java b/platform/platform-impl/src/com/intellij/internal/statistic/service/old/OldConfigurableStatisticsService.java index e41c5911d8c3..9fc5c2872230 100755 --- a/platform/platform-impl/src/com/intellij/internal/statistic/service/old/OldConfigurableStatisticsService.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/service/old/OldConfigurableStatisticsService.java @@ -36,6 +36,7 @@ public class OldConfigurableStatisticsService extends private static final Logger LOG = Logger.getInstance(OldConfigurableStatisticsService.class); private final StatisticsConnectionService connectionService = new OldStatisticsConnectionService(); + @NotNull @Override public String sendData() { String url = connectionService.getServiceUrl();