[jboss-cvs] JBossAS SVN: r111336 - in branches/JBPAPP_4_2_0_GA_CP/ejb3/src: test/org/jboss/ejb3/test/clusteredsession and 1 other directory.

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

Author: wolfc
Date: 2011-05-11 07:46:09 -0400 (Wed, 11 May 2011)
New Revision: 111336

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
Log:
JBPAPP-4182: activate/passivate SessionContext field

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java	2011-05-11 11:44:32 UTC (rev 111335)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java	2011-05-11 11:46:09 UTC (rev 111336)
@@ -21,34 +21,6 @@
  */
 package org.jboss.ejb3;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.security.Identity;
-import java.security.Principal;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-
-import javax.ejb.EJBException;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.EJBLocalObject;
-import javax.ejb.EJBObject;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.SessionContext;
-import javax.ejb.TimerService;
-import javax.ejb.TransactionManagementType;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-import javax.xml.rpc.handler.MessageContext;
-
 import org.jboss.annotation.security.SecurityDomain;
 import org.jboss.aop.Advisor;
 import org.jboss.ejb3.security.SecurityDomainManager;
@@ -56,12 +28,29 @@
 import org.jboss.ejb3.tx.TxUtil;
 import org.jboss.ejb3.tx.UserTransactionImpl;
 import org.jboss.logging.Logger;
+import org.jboss.metamodel.descriptor.SecurityRoleRef;
 import org.jboss.security.RealmMapping;
 import org.jboss.security.RunAsIdentity;
 import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimplePrincipal;
 
-import org.jboss.metamodel.descriptor.SecurityRoleRef;
+import javax.ejb.*;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import javax.xml.rpc.handler.MessageContext;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.security.Identity;
+import java.security.Principal;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Properties;
 
 /**
  * Comment
@@ -122,12 +111,22 @@
 
    public void writeExternal(ObjectOutput out) throws IOException
    {
-      out.writeUTF(Ejb3Registry.guid(container));
+      final boolean isClustered = container.isClustered();
+      out.writeBoolean(isClustered);
+      if (isClustered)
+         out.writeUTF(Ejb3Registry.clusterUid(container));
+      else
+         out.writeUTF(Ejb3Registry.guid(container));
    }
 
    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
    {
-      container = Ejb3Registry.getContainer(in.readUTF());
+      final boolean isClustered = in.readBoolean();
+      final String uid = in.readUTF();
+      if (isClustered)
+         container = Ejb3Registry.getClusterContainer(uid);
+      else
+         container = Ejb3Registry.getContainer(uid);
       InitialContext ctx = container.getInitialContext();
       try
       {

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java	2011-05-11 11:44:32 UTC (rev 111335)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java	2011-05-11 11:46:09 UTC (rev 111336)
@@ -21,12 +21,14 @@
   */
 package org.jboss.ejb3.test.clusteredsession;
 
+import org.jboss.annotation.ejb.Clustered;
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+
+import javax.annotation.Resource;
 import javax.ejb.Remote;
+import javax.ejb.SessionContext;
 import javax.ejb.Stateful;
 
-import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-
 /**
  * Stateful bean that configures clustering via annotations.
  *
@@ -43,4 +45,8 @@
    private static final long serialVersionUID = 1L;
    
    // Only difference from superclass is the added class-level annotations
+
+   // JBPAPP-4182: make sure we can passivate and activate SessionContext
+   @Resource
+   private SessionContext ctx;
 }