From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 :    Migrate I18n and logging support to i18n framework and SLF4J

---
 opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java
index d6f09cb..e3563b1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java
@@ -32,7 +32,7 @@
 import java.util.LinkedList;
 import java.io.IOException;
 
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.opendj.ldap.ByteSequenceReader;
 import org.forgerock.opendj.ldap.ByteString;
 import org.forgerock.opendj.ldap.ByteStringBuilder;
@@ -83,7 +83,7 @@
       // Read just the type.
       if(reader.remaining() <= 0)
       {
-        Message message =
+        LocalizableMessage message =
             ERR_ASN1_TRUCATED_TYPE_BYTE.get();
         throw new ASN1Exception(message);
       }
@@ -166,7 +166,7 @@
     {
       if(throwEofException)
       {
-        Message message =
+        LocalizableMessage message =
             ERR_ASN1_TRUCATED_TYPE_BYTE.get();
         throw new ASN1Exception(message);
       }
@@ -196,7 +196,7 @@
     {
       if(throwEofException)
       {
-        Message message =
+        LocalizableMessage message =
             ERR_ASN1_TRUNCATED_LENGTH_BYTE.get();
         throw new ASN1Exception(message);
       }
@@ -209,7 +209,7 @@
       int lengthBytesNeeded = peekLength;
       if (lengthBytesNeeded > 4)
       {
-        Message message =
+        LocalizableMessage message =
             ERR_ASN1_INVALID_NUM_LENGTH_BYTES.get(lengthBytesNeeded);
         throw new ASN1Exception(message);
       }
@@ -219,7 +219,7 @@
       {
         if(throwEofException)
         {
-          Message message =
+          LocalizableMessage message =
               ERR_ASN1_TRUNCATED_LENGTH_BYTES.get(lengthBytesNeeded);
           throw new ASN1Exception(message);
         }
@@ -238,7 +238,7 @@
     // message size.
     if ((maxElementSize > 0) && (peekLength > maxElementSize))
     {
-      Message m = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED.get(
+      LocalizableMessage m = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED.get(
           peekLength, maxElementSize);
       throw new ASN1Exception(m);
     }
@@ -256,14 +256,14 @@
 
     if (peekLength != 1)
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_BOOLEAN_INVALID_LENGTH.get(peekLength);
       throw new ASN1Exception(message);
     }
 
     if(reader.remaining() < peekLength)
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_BOOLEAN_TRUNCATED_VALUE.get(peekLength);
       throw new ASN1Exception(message);
     }
@@ -283,7 +283,7 @@
 
     if ((peekLength < 1) || (peekLength > 4))
     {
-      Message message = ERR_ASN1_INTEGER_INVALID_LENGTH.get(peekLength);
+      LocalizableMessage message = ERR_ASN1_INTEGER_INVALID_LENGTH.get(peekLength);
       throw new ASN1Exception(message);
     }
 
@@ -302,14 +302,14 @@
 
     if ((peekLength < 1) || (peekLength > 8))
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_INTEGER_INVALID_LENGTH.get(peekLength);
       throw new ASN1Exception(message);
     }
 
     if(reader.remaining() < peekLength)
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_INTEGER_TRUNCATED_VALUE.get(peekLength);
       throw new ASN1Exception(message);
     }
@@ -358,7 +358,7 @@
     // Make sure that the decoded length is exactly zero byte.
     if (peekLength != 0)
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_NULL_INVALID_LENGTH.get(peekLength);
       throw new ASN1Exception(message);
     }
@@ -375,7 +375,7 @@
 
     if(reader.remaining() < peekLength)
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE.get(peekLength);
       throw new ASN1Exception(message);
     }
@@ -404,7 +404,7 @@
 
     if(reader.remaining() < peekLength)
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE.get(peekLength);
       throw new ASN1Exception(message);
     }
@@ -424,7 +424,7 @@
     // Copy the value.
     if(reader.remaining() < peekLength)
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE.get(peekLength);
       throw new ASN1Exception(message);
     }
@@ -443,7 +443,7 @@
 
     if(reader.remaining() < peekLength)
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_SEQUENCE_SET_TRUNCATED_VALUE.get(peekLength);
       throw new ASN1Exception(message);
     }
@@ -484,7 +484,7 @@
   {
     if(readerStack.isEmpty())
     {
-      Message message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get();
+      LocalizableMessage message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get();
       throw new ASN1Exception(message);
     }
 
@@ -530,7 +530,7 @@
 
     if(reader.remaining() < peekLength)
     {
-      Message message =
+      LocalizableMessage message =
           ERR_ASN1_SKIP_TRUNCATED_VALUE.get(peekLength);
       throw new ASN1Exception(message);
     }

--
Gitblit v1.10.0