Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 76605 invoked from network); 18 Mar 2008 19:22:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Mar 2008 19:22:28 -0000 Received: (qmail 20999 invoked by uid 500); 18 Mar 2008 19:22:26 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 20965 invoked by uid 500); 18 Mar 2008 19:22:26 -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 20954 invoked by uid 99); 18 Mar 2008 19:22:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2008 12:22:25 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2008 19:21:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 48D511A9832; Tue, 18 Mar 2008 12:22:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r638516 - /directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java Date: Tue, 18 Mar 2008 19:22:05 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080318192205.48D511A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Tue Mar 18 12:22:00 2008 New Revision: 638516 URL: http://svn.apache.org/viewvc?rev=638516&view=rev Log: moved the LinkedAvlNodes array (nodes) from global scope to method local scope to make it thread safe Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java?rev=638516&r1=638515&r2=638516&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java Tue Mar 18 12:22:00 2008 @@ -46,8 +46,6 @@ /** key Comparator for the AvlTree */ private Comparator comparator; - private LinkedAvlNode[] nodes; - /** * Creates a new instance of AvlTreeMarshaller with a custom key @@ -190,8 +188,8 @@ int size = din.readInt(); - nodes = new LinkedAvlNode[ size ]; - LinkedAvlNode root = readTree( din, null ); + LinkedAvlNode[] nodes = new LinkedAvlNode[ size ]; + LinkedAvlNode root = readTree( din, null, nodes ); AvlTree tree = new AvlTree( comparator ); @@ -231,7 +229,7 @@ * @return the deserialized AvlTree node * @throws IOException on failures to deserialize or read from the stream */ - public LinkedAvlNode readTree( DataInputStream in, LinkedAvlNode node ) throws IOException + public LinkedAvlNode readTree( DataInputStream in, LinkedAvlNode node, LinkedAvlNode[] nodes ) throws IOException { int dLen = in.readInt(); @@ -250,14 +248,14 @@ if( childMarker == 2) { - node.setLeft( readTree( in, node.getLeft() ) ); + node.setLeft( readTree( in, node.getLeft(), nodes ) ); } childMarker = in.readInt(); if( childMarker == 4 ) { - node.setRight( readTree( in, node.getRight() ) ); + node.setRight( readTree( in, node.getRight(), nodes ) ); } return node;