From df76b20724fad58717bcf7d2ea3897743b7ed113 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 19 Jan 2010 12:53:36 +0000
Subject: [PATCH] toString() should never return null
---
opends/src/messages/messages/core.properties | 4 +++-
opends/src/server/org/opends/server/types/ResultCode.java | 8 +++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opends/src/messages/messages/core.properties b/opends/src/messages/messages/core.properties
index 17052e4..94a42ad 100644
--- a/opends/src/messages/messages/core.properties
+++ b/opends/src/messages/messages/core.properties
@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
-# Copyright 2006-2009 Sun Microsystems, Inc.
+# Copyright 2006-2010 Sun Microsystems, Inc.
@@ -1828,3 +1828,5 @@
SEVERE_WARN_SUBENTRY_FILTER_NOT_INDEXED_724=The search filter "%s" used by \
subentry manager is not indexed in backend %s. Backend initialization \
for subentry manager processing might take a very long time to complete
+INFO_RESULT_UNDEFINED_725=Undefined
+
diff --git a/opends/src/server/org/opends/server/types/ResultCode.java b/opends/src/server/org/opends/server/types/ResultCode.java
index 59c646c..4227935 100644
--- a/opends/src/server/org/opends/server/types/ResultCode.java
+++ b/opends/src/server/org/opends/server/types/ResultCode.java
@@ -22,13 +22,14 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.types;
import org.opends.messages.Message;
import org.opends.server.protocols.ldap.LDAPResultCode;
+import org.opends.server.util.Validator;
import static org.opends.messages.CoreMessages.*;
@@ -50,7 +51,7 @@
* The result code that should only be used if the actual result
* code has not yet been determined.
*/
- UNDEFINED(-1, null),
+ UNDEFINED(-1, INFO_RESULT_UNDEFINED.get()),
@@ -705,6 +706,7 @@
*/
private ResultCode(int intValue, Message name)
{
+ Validator.ensureNotNull(name);
this.intValue = intValue;
this.resultCodeName = name;
}
@@ -895,7 +897,7 @@
*/
public String toString()
{
- return resultCodeName != null ? resultCodeName.toString() : null;
+ return resultCodeName.toString();
}
}
--
Gitblit v1.10.0