From 10cbfd9e24f5c50d1446437fcbf7ecb7f4d329ae Mon Sep 17 00:00:00 2001
From: sin <sin@localhost>
Date: Wed, 15 Apr 2009 22:33:22 +0000
Subject: [PATCH] issue# 2608:stop-ds fails when connection with smtp-server fails
---
opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAlertHandler.java | 4 ++--
opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java | 22 ++++++++++++++++++++++
opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java | 6 +++++-
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
index 0a6f028..81b1ecf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.core;
import org.opends.messages.Message;
@@ -235,6 +235,10 @@
Properties properties = new Properties();
properties.setProperty(SMTP_PROPERTY_HOST, smtpHost);
properties.setProperty(SMTP_PROPERTY_PORT, smtpPort);
+ properties.setProperty(SMTP_PROPERTY_CONNECTION_TIMEOUT,
+ SMTP_DEFAULT_TIMEOUT_VALUE);
+ properties.setProperty(SMTP_PROPERTY_IO_TIMEOUT,
+ SMTP_DEFAULT_TIMEOUT_VALUE);
mailServerProperties.add(properties);
}
else
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAlertHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAlertHandler.java
index 057ce37..c96a511 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAlertHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAlertHandler.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -182,7 +182,7 @@
}
Message msg = WARN_SMTPALERTHANDLER_ERROR_SENDING_MESSAGE.get(
- alertType, alertMessage, stackTraceToSingleLineString(e));
+ alertType, alertMessage, e.getLocalizedMessage());
ErrorLogger.logError(msg);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java b/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
index 15934a0..f87175f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
@@ -2906,6 +2906,28 @@
/**
+ * The name of the JavaMail property that can be used to specify the socket
+ * connection timeout value in milliseconds.
+ */
+ public static final String SMTP_PROPERTY_CONNECTION_TIMEOUT =
+ "mail.smtp.connectiontimeout";
+
+
+ /**
+ * The name of the JavaMail property that can be used to specify the socket
+ * I/O timeout value in milliseconds.
+ */
+ public static final String SMTP_PROPERTY_IO_TIMEOUT = "mail.smtp.timeout";
+
+
+ /**
+ * The default timeout value for JavaMail timeout properties.
+ */
+ public static final String SMTP_DEFAULT_TIMEOUT_VALUE = "5000";
+
+
+
+ /**
* The description for the alert type that will be used for the alert
* notification generated if the multimaster replication detects
* a conflict that cannot be solved automatically.
--
Gitblit v1.10.0