Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 13:35:44 +01:00
Code Issues Packages Projects Releases Activity

fix possible NullPointerException

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-10-22 12:07:31 +02:00
parent 049e715dd5
commit ae56f8c96b
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitBlameViewer.java
View File

@@ -122,35 +122,39 @@ public class GitBlameViewer implements BlameViewer
List<BlameLine> blameLines = new ArrayList<BlameLine>();
int total = gitBlameResult.getResultContents().size();
for (int i = 0; i < total; i++)
int i = 0;
for (; i < total; i++)
{
PersonIdent author = gitBlameResult.getSourceAuthor(i);
BlameLine blameLine = new BlameLine();
RevCommit commit = gitBlameResult.getSourceCommit(i);
if ( commit != null )
{
PersonIdent author = gitBlameResult.getSourceAuthor(i);
BlameLine blameLine = new BlameLine();
blameLine.setLineNumber(i + 1);
blameLine.setAuthor(new Person(author.getName(),
author.getEmailAddress()));
blameLine.setLineNumber(i + 1);
blameLine.setAuthor(new Person(author.getName(),
author.getEmailAddress()));
RevCommit commit = gitBlameResult.getSourceCommit(i);
blameLine.setDescription(commit.getShortMessage());
blameLine.setDescription(commit.getShortMessage());
long when = GitUtil.getCommitTime(commit);
long when = GitUtil.getCommitTime(commit);
blameLine.setWhen(when);
blameLine.setWhen(when);
String rev = commit.getId().getName();
String rev = commit.getId().getName();
blameLine.setRevision(rev);
blameLine.setRevision(rev);
String content = gitBlameResult.getResultContents().getString(i);
String content = gitBlameResult.getResultContents().getString(i);
blameLine.setCode(content);
blameLines.add(blameLine);
blameLine.setCode(content);
blameLines.add(blameLine);
}
}
blameResult = new sonia.scm.repository.BlameResult(total, blameLines);
blameResult = new sonia.scm.repository.BlameResult(i, blameLines);
}
catch (IOException ex)
{