From: Eugene Petrenko <eugene.petrenko@gmail.com>
Date: Tue, 19 Jul 2011 15:17:36 +0000 (+0400)
Subject: merge NPE bugfix from v0.2
X-Git-Tag: v0.4~36
X-Git-Url: https://git.jetbrains.org/?p=teamcity%2FdotNetPackagesSupport.git;a=commitdiff_plain;h=a085579fc7daa3ac66ca9a52bd88384e3e67a805

merge NPE bugfix from v0.2
---

a085579fc7daa3ac66ca9a52bd88384e3e67a805
diff --cc nuget-server/src/jetbrains/buildServer/nuget/server/exec/SourcePackageInfo.java
index 51862e1,0b318ff..5ab8396
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/exec/SourcePackageInfo.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/exec/SourcePackageInfo.java
@@@ -28,7 -28,7 +28,8 @@@ public class SourcePackageInfo 
    private final String myPackageId;
    private final String myVersion;
  
 -  public PackageInfo(@Nullable final String source,
++
 +  public SourcePackageInfo(@Nullable final String source,
                             @NotNull final String packageId,
                             @NotNull final String version) {
      mySource = source;
diff --cc nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java
index 110c814,85bad5a..ffbdfe6
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java
@@@ -61,12 -61,14 +61,14 @@@ public class NamedPackagesUpdateChecke
      return null;
    }
  
 -  private String serializeHashcode(@NotNull final Collection<PackageInfo> _packages) {
 -    List<PackageInfo> sorted = new ArrayList<PackageInfo>(_packages);
 -    Collections.sort(sorted, new Comparator<PackageInfo>() {
 -      public int compare(PackageInfo o1, PackageInfo o2) {
 +  private String serializeHashcode(@NotNull final Collection<SourcePackageInfo> _packages) {
 +    List<SourcePackageInfo> sorted = new ArrayList<SourcePackageInfo>(_packages);
 +    Collections.sort(sorted, new Comparator<SourcePackageInfo>() {
 +      public int compare(SourcePackageInfo o1, SourcePackageInfo 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;