[jboss-cvs] JBossAS SVN: r69673 - branches/JBPAPP_4_2_0_GA_CP/messaging/src/main/org/jboss/mq/pm.

[jboss-cvs-commits at lists.jboss.org]

Author: jhowell at redhat.com
Date: 2008-02-06 16:35:44 -0500 (Wed, 06 Feb 2008)
New Revision: 69673

Modified:
   branches/JBPAPP_4_2_0_GA_CP/messaging/src/main/org/jboss/mq/pm/TxManager.java
Log:
JBPAPP-596 - the other to array used the array being passed in, but the size could have changed.  This leaves a null in the array, which blows out as a null pointer in other places.

Modified: branches/JBPAPP_4_2_0_GA_CP/messaging/src/main/org/jboss/mq/pm/TxManager.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/messaging/src/main/org/jboss/mq/pm/TxManager.java	2008-02-06 20:26:41 UTC (rev 69672)
+++ branches/JBPAPP_4_2_0_GA_CP/messaging/src/main/org/jboss/mq/pm/TxManager.java	2008-02-06 21:35:44 UTC (rev 69673)
@@ -314,7 +314,7 @@
    public Xid[] recover(ConnectionToken dc, int flags) throws Exception
    {
       Set preparedXids = prepared.keySet();
-      Xid[] xids = (Xid[]) preparedXids.toArray(new Xid[preparedXids.size()]);
+      Xid[] xids = (Xid[]) preparedXids.toArray();
       return xids;
    }