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 85bad5aba13bfea2e6945baec7c29910c567902a..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
@@ -3,7 +3,7 @@ package jetbrains.buildServer.nuget.server.trigger;
 import jetbrains.buildServer.buildTriggers.BuildTriggerDescriptor;\r
 import jetbrains.buildServer.buildTriggers.BuildTriggerException;\r
 import jetbrains.buildServer.nuget.server.exec.ListPackagesCommand;\r
-import jetbrains.buildServer.nuget.server.exec.PackageInfo;\r
+import jetbrains.buildServer.nuget.server.exec.SourcePackageInfo;\r
 import jetbrains.buildServer.serverSide.CustomDataStorage;\r
 import jetbrains.buildServer.util.StringUtil;\r
 import org.jetbrains.annotations.NotNull;\r
@@ -43,7 +43,7 @@ public class NamedPackagesUpdateChecker implements TriggerUpdateChecker {
       throw new BuildTriggerException("Failed to find NuGet.exe at: " + nugetPath);\r
     }\r
 \r
-    Collection<PackageInfo> result;\r
+    Collection<SourcePackageInfo> result;\r
     try {\r
       result = myCommand.checkForChanges(nugetPath, source, pkgId, version);\r
     } catch (Throwable t) {\r
@@ -61,10 +61,10 @@ public class NamedPackagesUpdateChecker implements TriggerUpdateChecker {
     return null;\r
   }\r
 \r
-  private String serializeHashcode(@NotNull final Collection<PackageInfo> _packages) {\r
-    List<PackageInfo> sorted = new ArrayList<PackageInfo>(_packages);\r
-    Collections.sort(sorted, new Comparator<PackageInfo>() {\r
-      public int compare(PackageInfo o1, PackageInfo o2) {\r
+  private String serializeHashcode(@NotNull final Collection<SourcePackageInfo> _packages) {\r
+    List<SourcePackageInfo> sorted = new ArrayList<SourcePackageInfo>(_packages);\r
+    Collections.sort(sorted, new Comparator<SourcePackageInfo>() {\r
+      public int compare(SourcePackageInfo o1, SourcePackageInfo o2) {\r
         int i;\r
         String s1 = o1.getSource();\r
         String s2 = o2.getSource();\r
@@ -76,7 +76,7 @@ public class NamedPackagesUpdateChecker implements TriggerUpdateChecker {
     });\r
 \r
     StringBuilder sb = new StringBuilder();\r
-    for (PackageInfo info : sorted) {\r
+    for (SourcePackageInfo info : sorted) {\r
       String source = info.getSource();\r
       if (source != null) {\r
         sb.append("|s:").append(source);\r