[jboss-svn-commits] JBL Code SVN: r30347 - in labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator: abstractrecord and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2009-11-25 10:24:05 -0500 (Wed, 25 Nov 2009)
New Revision: 30347

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/abstractrecord/RecordTypeManager.java
Log:
https://jira.jboss.org/jira/browse/JBTM-615

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java	2009-11-25 15:23:27 UTC (rev 30346)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java	2009-11-25 15:24:05 UTC (rev 30347)
@@ -434,7 +434,13 @@
 			return TwoPhaseOutcome.FINISH_ERROR;
 		}
 	}
-
+	
+	/**
+	 * @message com.arjuna.ats.arjuna.coordinator.AbstractRecord_npe
+         *          [com.arjuna.ats.arjuna.coordinator.AbstractRecord_npe] -
+         *          AbstractRecord.create {0} failed to find record.
+         */
+	
 	@SuppressWarnings("unchecked")
         public static AbstractRecord create (int type)
 	{
@@ -444,6 +450,15 @@
         
         	    return (AbstractRecord) recordClass.newInstance();
 	    }
+	    catch (final NullPointerException ex)
+	    {
+	        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                {
+                        tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.AbstractRecord_npe", new Object[] {new Integer(type)});
+                }
+	        
+	        return null;
+	    }
 	    catch (final Throwable ex)
 	    {
 	        ex.printStackTrace();

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/abstractrecord/RecordTypeManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/abstractrecord/RecordTypeManager.java	2009-11-25 15:23:27 UTC (rev 30346)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/abstractrecord/RecordTypeManager.java	2009-11-25 15:24:05 UTC (rev 30347)
@@ -75,6 +75,11 @@
         _map.add(map);
     }
     
+    public void remove (RecordTypeMap map)
+    {
+        _map.remove(map);
+    }
+    
     public static RecordTypeManager manager ()
     {
         return _instance;