Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 67524 invoked from network); 3 Feb 2009 00:37:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Feb 2009 00:37:27 -0000 Received: (qmail 5525 invoked by uid 500); 3 Feb 2009 00:37:26 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 5508 invoked by uid 500); 3 Feb 2009 00:37:26 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 5499 invoked by uid 99); 3 Feb 2009 00:37:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 16:37:26 -0800 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, 03 Feb 2009 00:37:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E6CCF23889A0; Tue, 3 Feb 2009 00:37:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740165 - /db/derby/code/branches/10.4/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java Date: Tue, 03 Feb 2009 00:37:05 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090203003705.E6CCF23889A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kmarsden Date: Tue Feb 3 00:37:05 2009 New Revision: 740165 URL: http://svn.apache.org/viewvc?rev=740165&view=rev Log: DERBY-576 xaHelper in ij creates global id that is not the same across platforms Modified: db/derby/code/branches/10.4/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java Modified: db/derby/code/branches/10.4/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java?rev=740165&r1=740164&r2=740165&view=diff ============================================================================== --- db/derby/code/branches/10.4/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java (original) +++ db/derby/code/branches/10.4/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java Tue Feb 3 00:37:05 2009 @@ -22,6 +22,8 @@ package org.apache.derby.impl.tools.ij; import org.apache.derby.iapi.tools.i18n.LocalizedResource; + +import java.io.UnsupportedEncodingException; import java.sql.Connection; import java.sql.SQLException; import java.util.Locale; @@ -79,7 +81,13 @@ private Xid makeXid(int xid) { - return new ijXid(xid, databaseName.getBytes()); + try { + return new ijXid(xid, databaseName.getBytes("UTF-8")); + } catch (UnsupportedEncodingException e) { + // UTF-8 is a required encoding. We should never get here. + e.printStackTrace(); + return null; + } } public void XADataSourceStatement(ij parser, Token dbname, Token shutdown,