dain 2005/02/08 21:07:57
Modified: modules/core/src/java/org/openejb/server/ejbd
ClientObjectFactory.java
Log:
Changed ContainerIndex to throw ContainerNotFoundException when a container
looked up by name is not found.
The ContainerNorFoundException contains the container name which is a lot
more readable the "-1"
Revision Changes Path
1.6 +10 -7
openejb/modules/core/src/java/org/openejb/server/ejbd/ClientObjectFactory.java
Index: ClientObjectFactory.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/ejbd/ClientObjectFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClientObjectFactory.java 30 Jul 2004 19:03:46 -0000 1.5
+++ ClientObjectFactory.java 9 Feb 2005 02:07:57 -0000 1.6
@@ -45,7 +45,6 @@
package org.openejb.server.ejbd;
import org.openejb.ContainerIndex;
-import org.openejb.client.ClientMetaData;
import org.openejb.client.EJBHomeHandle;
import org.openejb.client.EJBHomeHandler;
import org.openejb.client.EJBMetaDataImpl;
@@ -139,7 +138,7 @@
*/
protected javax.ejb.EJBMetaData _getEJBMetaData(CallContext call,
ProxyInfo info) {
- int idCode = containerIndex.getContainerIndex(info.getContainerID());
+ int idCode = getContainerId(info);
EJBMetaDataImpl metaData = new
EJBMetaDataImpl(info.getHomeInterface(),
info.getRemoteInterface(),
@@ -150,6 +149,10 @@
return metaData;
}
+ private int getContainerId(ProxyInfo info) {
+ return containerIndex.getContainerIndex(info.getContainerID());
+ }
+
/**
* Creates an EJBMetaDataImpl object that can be serialized and
* sent to the client.
@@ -162,7 +165,7 @@
*/
protected javax.ejb.Handle _getHandle(CallContext call, ProxyInfo info) {
- int idCode = containerIndex.getContainerIndex(info.getContainerID());
+ int idCode = getContainerId(info);
EJBMetaDataImpl eMetaData = new
EJBMetaDataImpl(info.getHomeInterface(),
info.getRemoteInterface(),
@@ -189,7 +192,7 @@
*/
protected javax.ejb.HomeHandle _getHomeHandle(CallContext call,
ProxyInfo info) {
- int idCode = containerIndex.getContainerIndex(info.getContainerID());
+ int idCode = getContainerId(info);
EJBMetaDataImpl eMetaData = new
EJBMetaDataImpl(info.getHomeInterface(),
info.getRemoteInterface(),
@@ -215,7 +218,7 @@
*/
protected javax.ejb.EJBObject _getEJBObject(CallContext call, ProxyInfo
info) {
- int idCode = containerIndex.getContainerIndex(info.getContainerID());
+ int idCode = getContainerId(info);
EJBMetaDataImpl eMetaData = new
EJBMetaDataImpl(info.getHomeInterface(),
info.getRemoteInterface(),
@@ -242,7 +245,7 @@
*/
protected javax.ejb.EJBHome _getEJBHome(CallContext call, ProxyInfo
info) {
- int idCode = containerIndex.getContainerIndex(info.getContainerID());
+ int idCode = getContainerId(info);
EJBMetaDataImpl eMetaData = new
EJBMetaDataImpl(info.getHomeInterface(),
info.getRemoteInterface(),
