Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 50489 invoked from network); 30 Aug 2006 15:01:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Aug 2006 15:01:43 -0000 Received: (qmail 121 invoked by uid 500); 30 Aug 2006 15:01:42 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 99984 invoked by uid 500); 30 Aug 2006 15:01:42 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 99973 invoked by uid 99); 30 Aug 2006 15:01:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Aug 2006 08:01:42 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Aug 2006 08:01:42 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E960D1A981A; Wed, 30 Aug 2006 08:01:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r438509 - in /directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap: codec/Control.java codec/util/LdapString.java message/ManageDsaITControl.java Date: Wed, 30 Aug 2006 15:01:21 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060830150121.E960D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: elecharny Date: Wed Aug 30 08:01:20 2006 New Revision: 438509 URL: http://svn.apache.org/viewvc?rev=438509&view=rev Log: Deleted the EMPTY_BYTES declaration and used the one in StringTools Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapString.java directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManageDsaITControl.java Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java?rev=438509&r1=438508&r2=438509&view=diff ============================================================================== --- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java (original) +++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java Wed Aug 30 08:01:20 2006 @@ -57,10 +57,6 @@ /** The control length */ private transient int controlLength; - private static final byte[] EMPTY_BYTES = new byte[] - {}; - - // ~ Methods // ------------------------------------------------------------------------------------ @@ -96,7 +92,7 @@ { if ( controlValue == null ) { - return EMPTY_BYTES; + return StringTools.EMPTY_BYTES; } else if ( controlValue instanceof String ) { @@ -130,7 +126,7 @@ { if ( encodedValue == null ) { - return EMPTY_BYTES; + return StringTools.EMPTY_BYTES; } return encodedValue; Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapString.java URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapString.java?rev=438509&r1=438508&r2=438509&view=diff ============================================================================== --- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapString.java (original) +++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapString.java Wed Aug 30 08:01:20 2006 @@ -22,6 +22,8 @@ import java.io.UnsupportedEncodingException; +import org.apache.directory.shared.ldap.util.StringTools; + /** * Decodes a LdapString, and checks that the character set used comply the ISO @@ -34,10 +36,6 @@ /** A null LdapString */ public transient static final LdapString EMPTY_STRING = new LdapString(); - /** A null LdapString */ - public transient static final byte[] EMPTY_BYTES = new byte[] - {}; - /** The inner String containing the LdapString */ protected String string; @@ -50,7 +48,7 @@ */ public LdapString() { - bytes = EMPTY_BYTES; + bytes = StringTools.EMPTY_BYTES; string = ""; } Modified: directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManageDsaITControl.java URL: http://svn.apache.org/viewvc/directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManageDsaITControl.java?rev=438509&r1=438508&r2=438509&view=diff ============================================================================== --- directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManageDsaITControl.java (original) +++ directory/branches/shared/0.9.5/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManageDsaITControl.java Wed Aug 30 08:01:20 2006 @@ -19,6 +19,8 @@ */ package org.apache.directory.shared.ldap.message; +import org.apache.directory.shared.ldap.util.StringTools; + /** * Control which allows for the management of referrals and other DSA specific @@ -64,15 +66,12 @@ private static final long serialVersionUID = -8844249964346248321L; - private final static byte[] EMPTY_BYTES = new byte[0]; - - /** * Returns an empty byte[] everytime. */ public byte[] getEncodedValue() { - return EMPTY_BYTES; + return StringTools.EMPTY_BYTES; } @@ -81,7 +80,7 @@ */ public byte[] getValue() { - return EMPTY_BYTES; + return StringTools.EMPTY_BYTES; }