From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0

---
 opends/src/server/org/opends/server/controls/ServerSideSortResponseControl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opends/src/server/org/opends/server/controls/ServerSideSortResponseControl.java b/opends/src/server/org/opends/server/controls/ServerSideSortResponseControl.java
index 427b477..8312414 100644
--- a/opends/src/server/org/opends/server/controls/ServerSideSortResponseControl.java
+++ b/opends/src/server/org/opends/server/controls/ServerSideSortResponseControl.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2008 Sun Microsystems, Inc.
+ *      Copyright 2008-2009 Sun Microsystems, Inc.
  */
 package org.opends.server.controls;
 import org.opends.messages.Message;
@@ -222,7 +222,7 @@
     writer.writeStartSequence(UNIVERSAL_OCTET_STRING_TYPE);
 
     writer.writeStartSequence();
-    writer.writeInteger(resultCode);
+    writer.writeEnumerated(resultCode);
     if (attributeType != null)
     {
       writer.writeOctetString(TYPE_ATTRIBUTE_TYPE, attributeType);

--
Gitblit v1.10.0