From ba32fa43fe6f67879cffa0589705373d7cebafe4 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 28 May 2010 10:05:39 +0000
Subject: [PATCH] Fix NPE in upgrade.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index a791ec0..5a34245 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -476,9 +476,17 @@
String ldapUrl = "ldaps://"+hostName+":" + port;
try
{
+ int timeout = ConnectionUtils.getDefaultLDAPTimeout();
+ if (application != null)
+ {
+ if (application.getUserData() != null)
+ {
+ timeout = application.getUserData().getConnectTimeout();
+ }
+ }
ctx = Utils.createLdapsContext(
ldapUrl,
- userDn, userPw, application.getUserData().getConnectTimeout(),
+ userDn, userPw, timeout,
null, null);
connected = true;
}
--
Gitblit v1.10.0