From 1cf1b22e8cedd6e8439f5bd5db619b5ff783aa7b Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 08 Nov 2007 11:01:30 +0000
Subject: [PATCH] Fix for issue 2575.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
index fed0bfe..a50ccf5 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -684,15 +684,27 @@
buf.append(INFO_SERVER_ERROR.get(hostName));
buf.append(" ");
}
- if (te.getCause() instanceof NamingException)
+ if (te.getType() == TopologyCacheException.Type.TIMEOUT)
+ {
+ buf.append(INFO_ERROR_CONNECTING_TIMEOUT.get());
+ }
+ else if (te.getCause() instanceof NamingException)
{
buf.append(getThrowableMsg(INFO_ERROR_CONNECTING_TO_LOCAL.get(),
te.getCause()));
}
else
{
+ LOG.log(Level.WARNING, "Unexpected error: "+te, te);
// This is unexpected.
- buf.append(getThrowableMsg(INFO_BUG_MSG.get(), te.getCause()));
+ if (te.getCause() != null)
+ {
+ buf.append(getThrowableMsg(INFO_BUG_MSG.get(), te.getCause()));
+ }
+ else
+ {
+ buf.append(getThrowableMsg(INFO_BUG_MSG.get(), te));
+ }
}
return buf.toMessage();
}
--
Gitblit v1.10.0