From 440500cba99f125b1f5f7124b8aecca4da3ed8dc Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 08 Oct 2009 14:20:42 +0000
Subject: [PATCH] Fix a potential NullPointerException when building the error message to be displayed to the user.
---
opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index d3ddd58..c1e59aa 100644
--- a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -8506,7 +8506,15 @@
}
else if (c instanceof OpenDsException)
{
- s = ((OpenDsException)c).getMessageObject().toString();
+ Message msg = ((OpenDsException)c).getMessageObject();
+ if (msg != null)
+ {
+ s = msg.toString();
+ }
+ else
+ {
+ s = c.toString();
+ }
}
else
{
--
Gitblit v1.10.0