From b75f522e223fcee55e9e474bf691f48d54703f3f Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Thu, 03 May 2007 15:15:37 +0000
Subject: [PATCH] Issue [1395] NullPointerException raised by ldapsearch when prompt for bind passwd
---
opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java b/opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java
index ec766ef..62dde1b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java
@@ -210,17 +210,13 @@
if ((charRead == -1) || (charRead == '\n'))
{
// This is the end of the value.
- if (pos == 0)
+ pwChars = new char[pos];
+ if (0 < pos)
{
- return null;
- }
- else
- {
- pwChars = new char[pos];
System.arraycopy(pwBuffer, 0, pwChars, 0, pos);
Arrays.fill(pwBuffer, '\u0000');
- return pwChars;
}
+ return pwChars;
}
else if (charRead == '\r')
{
--
Gitblit v1.10.0