From: Eugene Petrenko Date: Tue, 19 Jul 2011 15:12:39 +0000 (+0400) Subject: add more NPE fix X-Git-Tag: v0.4~36^2 X-Git-Url: https://git.jetbrains.org/?p=teamcity%2FdotNetPackagesSupport.git;a=commitdiff_plain;h=3b6585f007eb99ec37cc17266e5def0fa7cc3486 add more NPE fix --- diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java b/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java index 06e2365..85bad5a 100644 --- a/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java +++ b/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java @@ -66,7 +66,9 @@ public class NamedPackagesUpdateChecker implements TriggerUpdateChecker { Collections.sort(sorted, new Comparator() { public int compare(PackageInfo o1, PackageInfo o2) { int i; - if (0 != (i = o1.getSource().compareTo(o2.getSource()))) return i; + String s1 = o1.getSource(); + String s2 = o2.getSource(); + if (s1 != null && s2 != null && 0 != (i = s1.compareTo(s2))) return i; if (0 != (i = o1.getPackageId().compareTo(o2.getPackageId()))) return i; if (0 != (i = o1.getVersion().compareTo(o2.getVersion()))) return i; return 0;