merge NPE bugfix from v0.2

[teamcity/dotNetPackagesSupport.git] / nuget-server / src / jetbrains / buildServer / nuget / server / trigger / NamedPackagesUpdateChecker.java

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 110c8146651003bed89599a99647889d8719bdb5..ffbdfe6139b1ea31d5e74705cd17acce04136875 100644 (file)
--- 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<SourcePackageInfo>() {\r
       public int compare(SourcePackageInfo o1, SourcePackageInfo o2) {\r
         int i;\r
-        if (0 != (i = o1.getSource().compareTo(o2.getSource()))) return i;\r
+        String s1 = o1.getSource();\r
+        String s2 = o2.getSource();\r
+        if (s1 != null && s2 != null && 0 != (i = s1.compareTo(s2))) return i;\r
         if (0 != (i = o1.getPackageId().compareTo(o2.getPackageId()))) return i;\r
         if (0 != (i = o1.getVersion().compareTo(o2.getVersion()))) return i;\r
         return 0;\r