From a6f8e77979e4968ff1862b0b9e277309fe8bc5fd 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
---
opends/src/server/org/opends/server/util/PasswordReader.java | 10 +++-------
opends/src/server/org/opends/server/tools/LDAPSearch.java | 3 ++-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPSearch.java b/opends/src/server/org/opends/server/tools/LDAPSearch.java
index 2c604de..bffff7d 100644
--- a/opends/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opends/src/server/org/opends/server/tools/LDAPSearch.java
@@ -1099,7 +1099,8 @@
err.println(wrapText(ex.getMessage(), MAX_LINE_WIDTH));
return 1;
}
- } else if(bindPasswordValue == null)
+ }
+ else if(bindPasswordValue == null)
{
// Read from file if it exists.
bindPasswordValue = bindPasswordFile.getValue();
diff --git a/opends/src/server/org/opends/server/util/PasswordReader.java b/opends/src/server/org/opends/server/util/PasswordReader.java
index ec766ef..62dde1b 100644
--- a/opends/src/server/org/opends/server/util/PasswordReader.java
+++ b/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