From 1fb5982ae5e49b741efb409adcb19c663ba6034d Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 1 Apr 2009 17:41:54 +0000
Subject: [PATCH] fix: NPE
SVN: 10538
---
.../cisd/common/filesystem/rsync/RsyncVersionChecker.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java
index d5412b7e3dc..bedd12f11d4 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java
@@ -173,12 +173,12 @@ final class RsyncVersionChecker
{
assert rsyncExecutable != null;
- String rsyncVersion = tryGetRsyncVersion(rsyncExecutable);
- if (rsyncVersion == null)
+ String rsyncVersionOrNull = tryGetRsyncVersion(rsyncExecutable);
+ if (rsyncVersionOrNull == null)
{
return null;
}
- return parseVersion(rsyncVersion);
+ return parseVersion(rsyncVersionOrNull);
}
/**
@@ -222,7 +222,7 @@ final class RsyncVersionChecker
static RsyncVersion tryParseVersionLine(String rsyncVersionLine)
{
final String rsyncVersionOrNull = tryExtractRsyncVersion(rsyncVersionLine);
- if (rsyncVersionLine == null)
+ if (rsyncVersionOrNull == null)
{
return null;
} else
--
GitLab