Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 09:46:16 +01:00
Code Issues Packages Projects Releases Activity

fix another npe on empty repository

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-08-03 08:31:27 +02:00
parent 1a63bb58e2
commit 21f51ba868
2 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
View File

@@ -36,6 +36,7 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
@@ -47,6 +48,7 @@ import sonia.scm.repository.spi.javahg.HgLogChangesetCommand;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
@@ -141,6 +143,9 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
HgLogChangesetCommand.on(repository).rev("tip").singleRevision();
}
if (start >= 0)
{
int total = start - end + 1;
if (request.getPagingStart() > 0)
@@ -163,6 +168,13 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
result = new ChangesetPagingResult(total, changesets);
}
else
{
// empty repository
result = new ChangesetPagingResult(0, new ArrayList<Changeset>());
}
}
return result;
}

6
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java
View File

@@ -218,7 +218,11 @@ public class HgLogChangesetCommand extends AbstractCommand
*/
public int singleRevision(String... files)
{
return Utils.single(loadRevisions(files));
Integer rev = Utils.single(loadRevisions(files));
if ( rev == null ){
rev = -1;
}
return rev;
}
//~--- get methods ----------------------------------------------------------