From 33eb6a60d7bce40f7f06fa3c66907bfba4db04e3 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 6 May 2013 09:07:10 +0200 Subject: [PATCH] fix possible npe --- .../scm/repository/spi/javahg/HgLogChangesetCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java index 0cd96facd0..1b951b62ef 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java @@ -294,7 +294,7 @@ public class HgLogChangesetCommand extends AbstractCommand { changeset.getParents().add(p1); } - + in.mustMatch(' '); String p2 = readId(in, changeset, PROPERTY_PARENT2_REVISION); @@ -393,7 +393,7 @@ public class HgLogChangesetCommand extends AbstractCommand { Integer rev = in.readDecimal(); - if (rev != null && rev >= 0) + if ((rev != null) && (rev >= 0)) { changeset.setProperty(propertyKey, String.valueOf(rev)); } @@ -459,7 +459,7 @@ public class HgLogChangesetCommand extends AbstractCommand private boolean isNullId(String id) { return ((id != null) && id.equals("-1:".concat(NULL_ID))) - || id.equals(NULL_ID); + || NULL_ID.equals(id); } //~--- fields ---------------------------------------------------------------