User: docodan
Date: 01/06/04 14:59:05
Modified: src/main/org/jboss/ejb EntityEnterpriseContext.java
StatefulSessionEnterpriseContext.java
StatelessSessionEnterpriseContext.java
Log:
Implemented getEJBLocal
Revision Changes Path
1.18 +6 -2 jboss/src/main/org/jboss/ejb/EntityEnterpriseContext.java
Index: EntityEnterpriseContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EntityEnterpriseContext.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EntityEnterpriseContext.java 2001/06/04 20:47:29 1.17
+++ EntityEnterpriseContext.java 2001/06/04 21:59:05 1.18
@@ -26,7 +26,7 @@
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author Daniel OConnor ([EMAIL PROTECTED])
-* @version $Revision: 1.17 $
+* @version $Revision: 1.18 $
*/
public class EntityEnterpriseContext
extends EnterpriseContext
@@ -163,6 +163,9 @@
{
public EJBObject getEJBObject()
{
+
+ if (((EntityContainer)con).getContainerInvoker()==null)
+ throw new IllegalStateException( "No remote interface defined." );
if (ejbObject == null) {
try {
@@ -183,6 +186,8 @@
public EJBLocalObject getEJBLocalObject()
{
+ if (con.getLocalHomeClass()==null)
+ throw new IllegalStateException( "No local interface for bean." );
if (ejbLocalObject == null)
{
Object cacheKey = ((EntityCache) ((EntityContainer)
con).getInstanceCache())
@@ -190,7 +195,6 @@
ejbLocalObject = ((EntityContainer)con).getLocalContainerInvoker()
.getEntityEJBLocalObject(cacheKey);
}
-
return ejbLocalObject;
}
1.10 +11 -2
jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java
Index: StatefulSessionEnterpriseContext.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StatefulSessionEnterpriseContext.java 2001/06/04 17:22:24 1.9
+++ StatefulSessionEnterpriseContext.java 2001/06/04 21:59:05 1.10
@@ -23,7 +23,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author Daniel OConnor ([EMAIL PROTECTED])
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class StatefulSessionEnterpriseContext
extends EnterpriseContext
@@ -107,6 +107,9 @@
{
public EJBObject getEJBObject()
{
+ if
(((StatefulSessionContainer)con).getContainerInvoker()==null)
+ throw new IllegalStateException( "No remote interface
defined." );
+
if (ejbObject == null) {
try {
@@ -124,7 +127,13 @@
public EJBLocalObject getEJBLocalObject()
{
- throw new IllegalStateException();
+ if (con.getLocalHomeClass()==null)
+ throw new IllegalStateException( "No local interface for bean." );
+ if (ejbLocalObject == null)
+ {
+ ejbLocalObject =
((StatefulSessionContainer)con).getLocalContainerInvoker().getStatefulSessionEJBLocalObject(id);
+ }
+ return ejbLocalObject;
}
public Object getPrimaryKey()
1.8 +14 -2
jboss/src/main/org/jboss/ejb/StatelessSessionEnterpriseContext.java
Index: StatelessSessionEnterpriseContext.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatelessSessionEnterpriseContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StatelessSessionEnterpriseContext.java 2001/06/04 17:22:24 1.7
+++ StatelessSessionEnterpriseContext.java 2001/06/04 21:59:05 1.8
@@ -25,7 +25,7 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class StatelessSessionEnterpriseContext
extends EnterpriseContext
@@ -34,6 +34,7 @@
// Attributes ----------------------------------------------------
EJBObject ejbObject;
+ EJBLocalObject ejbLocalObject;
SessionContext ctx;
// Static --------------------------------------------------------
@@ -68,6 +69,8 @@
// Public --------------------------------------------------------
public void setEJBObject(EJBObject eo) { ejbObject = eo; }
public EJBObject getEJBObject() { return ejbObject; }
+ public void setEJBLocalObject(EJBLocalObject eo) { ejbLocalObject = eo; }
+ public EJBLocalObject getEJBLocalObject() { return ejbLocalObject; }
public SessionContext getSessionContext() {
return ctx;
@@ -96,6 +99,9 @@
{
public EJBObject getEJBObject()
{
+ if (((StatelessSessionContainer)con).getContainerInvoker()==null)
+ throw new IllegalStateException( "No remote interface defined." );
+
if (ejbObject == null) {
try {
@@ -113,7 +119,13 @@
public EJBLocalObject getEJBLocalObject()
{
- throw new IllegalStateException();
+ if (con.getLocalHomeClass()==null)
+ throw new IllegalStateException( "No local interface for bean." );
+ if (ejbLocalObject == null)
+ {
+ ejbLocalObject =
((StatelessSessionContainer)con).getLocalContainerInvoker().getStatelessSessionEJBLocalObject();
+ }
+ return ejbLocalObject;
}
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
