Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 88029 invoked from network); 16 Sep 2008 13:42:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Sep 2008 13:42:01 -0000 Received: (qmail 42408 invoked by uid 500); 16 Sep 2008 13:41:47 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 42375 invoked by uid 500); 16 Sep 2008 13:41:47 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 42361 invoked by uid 99); 16 Sep 2008 13:41:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Sep 2008 06:41:47 -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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Sep 2008 13:40:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7D793238896F; Tue, 16 Sep 2008 06:41:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r695880 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java Date: Tue, 16 Sep 2008 13:41:29 -0000 To: commits@jackrabbit.apache.org From: dpfister@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080916134129.7D793238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dpfister Date: Tue Sep 16 06:41:28 2008 New Revision: 695880 URL: http://svn.apache.org/viewvc?rev=695880&view=rev Log: JCR-1734 - Generated cluster node id should be persisted - use commons-io Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java?rev=695880&r1=695879&r2=695880&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java Tue Sep 16 06:41:28 2008 @@ -18,6 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.core.config.ClusterConfig; import org.apache.jackrabbit.core.config.ConfigurationException; import org.apache.jackrabbit.core.config.JournalConfig; @@ -378,50 +379,15 @@ File f = new File(filename); if (f.exists() && f.canRead()) { - BufferedReader reader = null; - - try { - reader = new BufferedReader(new FileReader(f)); - return reader.readLine(); - } finally { - if (reader != null) { - reader.close(); - } - } + return FileUtils.readFileToString(f); } - FileWriter writer = null; String id = UUID.randomUUID().toString(); - - try { - writer = new FileWriter(f); - writer.write(id); - } finally { - if (writer != null) { - writer.close(); - } - } + FileUtils.writeStringToFile(f, id); return id; } - /** - * Return a zero-padded short string representation. - * - * @param n short - * @return string representation - */ - private static String toHexString(short n) { - String s = Integer.toHexString(n); - int padlen = SHORT_PADDING.length() - s.length(); - if (padlen < 0) { - s = s.substring(-padlen); - } else if (padlen > 0) { - s = SHORT_PADDING.substring(0, padlen) + s; - } - return s; - } - //-----------------------------------------------< NamespaceEventListener > /**