From 78ccbe537b86a09fc3dee784a60de0766c52a917 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 19 Jan 2010 15:26:38 +0000
Subject: [PATCH] Fix issue 4492: base searches don't work.
---
opends/src/server/org/opends/server/util/StaticUtils.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/StaticUtils.java b/opends/src/server/org/opends/server/util/StaticUtils.java
index 6c3e088..4ea46c1 100644
--- a/opends/src/server/org/opends/server/util/StaticUtils.java
+++ b/opends/src/server/org/opends/server/util/StaticUtils.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.util;
@@ -1563,13 +1563,17 @@
}
else if (t instanceof NullPointerException)
{
- StackTraceElement[] stackElements = t.getStackTrace();
-
MessageBuilder message = new MessageBuilder();
message.append("NullPointerException(");
- message.append(stackElements[0].getFileName());
- message.append(":");
- message.append(stackElements[0].getLineNumber());
+
+ StackTraceElement[] stackElements = t.getStackTrace();
+ if (stackElements.length > 0)
+ {
+ message.append(stackElements[0].getFileName());
+ message.append(":");
+ message.append(stackElements[0].getLineNumber());
+ }
+
message.append(")");
return message.toMessage();
}
@@ -1597,19 +1601,23 @@
if (t.getMessage() == null)
{
StackTraceElement[] stackElements = t.getStackTrace();
- message.append(stackElements[0].getFileName());
- message.append(":");
- message.append(stackElements[0].getLineNumber());
- // FIXME Temporary to debug issue 2256.
- if (t instanceof IllegalStateException)
+ if (stackElements.length > 0)
{
- for (int i = 1; i < stackElements.length; i++)
+ message.append(stackElements[0].getFileName());
+ message.append(":");
+ message.append(stackElements[0].getLineNumber());
+
+ // FIXME Temporary to debug issue 2256.
+ if (t instanceof IllegalStateException)
{
- message.append(' ');
- message.append(stackElements[i].getFileName());
- message.append(":");
- message.append(stackElements[i].getLineNumber());
+ for (int i = 1; i < stackElements.length; i++)
+ {
+ message.append(' ');
+ message.append(stackElements[i].getFileName());
+ message.append(":");
+ message.append(stackElements[i].getLineNumber());
+ }
}
}
}
--
Gitblit v1.10.0