From af6d91bfa59ab88bfbbceeecec747a2387c556b1 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Tue, 25 Mar 2008 10:45:11 +0000
Subject: [PATCH] fix: 'redundant null check' warning by adding one more null
check
SVN: 4994
---
.../systemsx/cisd/common/concurrent/ConcurrencyUtilities.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/ConcurrencyUtilities.java b/common/source/java/ch/systemsx/cisd/common/concurrent/ConcurrencyUtilities.java
index 086dfc1ac30..298d287b338 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/ConcurrencyUtilities.java
+++ b/common/source/java/ch/systemsx/cisd/common/concurrent/ConcurrencyUtilities.java
@@ -113,7 +113,8 @@ public final class ConcurrencyUtilities
if (loggerOrNull != null)
{
final String message =
- (cause.getMessage() == null) ? "<no message>" : cause.getMessage();
+ (cause == null || cause.getMessage() == null) ? "<no message>" : cause
+ .getMessage();
final String className =
(cause == null) ? "<unknown class>" : cause.getClass().getSimpleName();
loggerOrNull.log(LogLevel.ERROR, String.format(
--
GitLab