[jboss-svn-commits] JBL Code SVN: r24828 - labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific.

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

Author: mark.little at jboss.com
Date: 2009-01-20 11:18:35 -0500 (Tue, 20 Jan 2009)
New Revision: 24828

Modified:
   labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/CurrentImple.java
Log:
https://jira.jboss.org/jira/browse/JBTM-472

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/CurrentImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/CurrentImple.java	2009-01-20 15:28:18 UTC (rev 24827)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/CurrentImple.java	2009-01-20 16:18:35 UTC (rev 24828)
@@ -854,10 +854,17 @@
 					+ which + " )");
 		}
 
-		if (which.isLocal())
-			resumeImple(which.getImple());
+		if (which != null)
+		{
+		    if (which.isLocal())
+		        resumeImple(which.getImple());
+		    else
+		        resume(which.getControl());
+		}
 		else
-			resume(which.getControl());
+		{
+		    resumeImple(null);
+		}
 	}
 
 	public ControlWrapper suspendWrapper () throws SystemException