[jboss-svn-commits] JBL Code SVN: r37769 - labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq.

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

Author: jhalliday
Date: 2011-12-02 11:57:15 -0500 (Fri, 02 Dec 2011)
New Revision: 37769

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqObjectStoreAdaptor.java
Log:
fix HornetQ journal array value handling. JBTM-993


Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java	2011-12-02 16:54:01 UTC (rev 37768)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java	2011-12-02 16:57:15 UTC (rev 37769)
@@ -61,7 +61,7 @@
     private long maxID = 0;
 
     private final String storeDirCanonicalPath;
-    
+
     private static final byte RECORD_TYPE = 0x00;
 
     public void stop() throws Exception {

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqObjectStoreAdaptor.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqObjectStoreAdaptor.java	2011-12-02 16:54:01 UTC (rev 37768)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqObjectStoreAdaptor.java	2011-12-02 16:57:15 UTC (rev 37769)
@@ -320,7 +320,7 @@
 
         typeName = ensureTypenamePrefix(typeName);
 
-        Uid[] uids = store.getUidsForType(typeName);
+        Uid[] uids = store.getUidsForType(typeName); // may contain trailing null elements
 
         OutputObjectState buffer = new OutputObjectState();
 
@@ -330,7 +330,9 @@
             {
                 for (Uid uid: uids)
                 {
-                    UidHelper.packInto(uid, buffer);
+                    if(uid != null) {
+                        UidHelper.packInto(uid, buffer);
+                    }
                 }
             }
             UidHelper.packInto(Uid.nullUid(), buffer);
@@ -362,7 +364,7 @@
 
         boolean result = true;
 
-        String[] knownTypes = store.getKnownTypes();
+        String[] knownTypes = store.getKnownTypes(); // may contain trailing null elements
         Set<String> typeSet = new HashSet<String>();
 
         if (knownTypes == null || knownTypes.length == 0)
@@ -374,6 +376,10 @@
         {
             for (String typeName: knownTypes)
             {
+                if(typeName == null) {
+                    continue;
+                }
+
                 if(typeName.startsWith("/")) {
                     typeName = typeName.substring(1);
                 }