Author: dblevins
Date: Thu Mar 3 17:37:30 2011
New Revision: 1076698
URL: http://svn.apache.org/viewvc?rev=1076698&view=rev
Log:
Ensure the EntityContext is set in the BeanContext so allowed operations
checking can work
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?rev=1076698&r1=1076697&r2=1076698&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
Thu Mar 3 17:37:30 2011
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.Set;
+import javax.ejb.EJBContext;
import javax.ejb.EJBException;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
@@ -158,7 +159,7 @@ public class CmpContainer implements Rpc
cmpEngine.deploy(beanContext);
beanContext.setContainerData(cmpEngine);
-
+ beanContext.set(EJBContext.class, new
EntityContext(securityService));
// try to set deploymentInfo static field on bean implementation
class
try {
Field field =
beanContext.getCmpImplClass().getField("deploymentInfo");
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java?rev=1076698&r1=1076697&r2=1076698&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
Thu Mar 3 17:37:30 2011
@@ -33,6 +33,7 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.Stack;
+import javax.ejb.EJBContext;
import javax.ejb.EntityBean;
import javax.ejb.NoSuchEntityException;
import java.util.HashMap;
@@ -69,6 +70,7 @@ public class EntityInstanceManager {
public void deploy(BeanContext beanContext) {
poolMap.put(beanContext.getDeploymentID(), new
LinkedListStack(poolsize / 2));
+ beanContext.set(EJBContext.class, createEntityContext());
}
public void undeploy(BeanContext beanContext) {
