fix rename issue of NPE fix merge
authorEugene Petrenko <eugene.petrenko@gmail.com>
Tue, 19 Jul 2011 15:12:16 +0000 (19:12 +0400)
committerEugene Petrenko <eugene.petrenko@gmail.com>
Tue, 19 Jul 2011 15:12:16 +0000 (19:12 +0400)
nuget-server/src/jetbrains/buildServer/nuget/server/exec/PackageInfo.java
nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java
nuget-tests/src/jetbrains/buildServer/nuget/tests/server/ListPackagesCommandProcessorTest.java

index f964f0ab09a829111aaa4462dfbb2232f58209a0..0b318ff1d69df0d856f0331c70817e6ef2bd6917 100644 (file)
@@ -28,7 +28,7 @@ public class PackageInfo {
   private final String myPackageId;\r
   private final String myVersion;\r
 \r
-  public SourcePackageInfo(@Nullable final String source,\r
+  public PackageInfo(@Nullable final String source,\r
                            @NotNull final String packageId,\r
                            @NotNull final String version) {\r
     mySource = source;\r
index 90020bbf07e807cbbb38bb8ae4f501681ad0184e..06e2365d9daf8626b8c76022eda218d0a035c6c4 100644 (file)
@@ -74,7 +74,7 @@ public class NamedPackagesUpdateChecker implements TriggerUpdateChecker {
     });\r
 \r
     StringBuilder sb = new StringBuilder();\r
-    for (SourcePackageInfo info : sorted) {\r
+    for (PackageInfo info : sorted) {\r
       String source = info.getSource();\r
       if (source != null) {\r
         sb.append("|s:").append(source);\r
index 27f6b1755812175ccad2a7830d9591fd51f4fafd..2c01f64b71d4c683b70f581dfc93fb4aa8cda627 100644 (file)
@@ -82,9 +82,9 @@ public class ListPackagesCommandProcessorTest extends BaseTestCase {
     p = new ListPackagesCommandProcessor(null);\r
     p.onStdOutput("##teamcity[nuget-package Id='NUnit' Version='2.5.10.11092']");\r
 \r
-    Collection<SourcePackageInfo> result = p.getResult();\r
+    Collection<PackageInfo> result = p.getResult();\r
     Assert.assertEquals(result.size(), 1);\r
-    SourcePackageInfo next = result.iterator().next();\r
+    PackageInfo next = result.iterator().next();\r
 \r
     Assert.assertEquals(next.getSource(), null);\r
     Assert.assertEquals(next.getPackageId(), "NUnit");\r