dain 2005/02/08 21:07:54
Modified: modules/core/src/java/org/openejb ContainerIndex.java
Added: modules/core/src/java/org/openejb
ContainerNotFoundException.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.15 +7 -4
openejb/modules/core/src/java/org/openejb/ContainerIndex.java
Index: ContainerIndex.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/ContainerIndex.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ContainerIndex.java 3 Feb 2005 03:09:52 -0000 1.14
+++ ContainerIndex.java 9 Feb 2005 02:07:53 -0000 1.15
@@ -189,9 +189,12 @@
return (index == null) ? -1 : index.intValue();
}
- public synchronized EJBContainer getContainer(String containerID) {
- //TODO return an informative exception if there is no such
containerId. Currently returns ArrayIndexOutOfBoundsException(-1)
- return getContainer(getContainerIndex(containerID));
+ public synchronized EJBContainer getContainer(String containerID) throws
ContainerNotFoundException {
+ int containerIndex = getContainerIndex(containerID);
+ if (containerIndex < 0) {
+ throw new ContainerNotFoundException(containerID);
+ }
+ return getContainer(containerIndex);
}
public synchronized EJBContainer getContainer(Integer index) {
1.1
openejb/modules/core/src/java/org/openejb/ContainerNotFoundException.java
Index: ContainerNotFoundException.java
===================================================================
/* ====================================================================
* Redistribution and use of this software and associated documentation
* ("Software"), with or without modification, are permitted provided
* that the following conditions are met:
*
* 1. Redistributions of source code must retain copyright
* statements and notices. Redistributions must also contain a
* copy of this document.
*
* 2. Redistributions in binary form must reproduce this list of
* conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. The name "OpenEJB" must not be used to endorse or promote
* products derived from this Software without prior written
* permission of The OpenEJB Group. For written permission,
* please contact [EMAIL PROTECTED]
*
* 4. Products derived from this Software may not be called "OpenEJB"
* nor may "OpenEJB" appear in their names without prior written
* permission of The OpenEJB Group. OpenEJB is a registered
* trademark of The OpenEJB Group.
*
* 5. Due credit should be given to the OpenEJB Project
* (http://openejb.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
* NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the OpenEJB Project. For more information
* please see <http://openejb.org/>.
*
* ====================================================================
*/
package org.openejb;
/**
* @version $Revision: 1.1 $ $Date: 2005/02/09 02:07:54 $
*/
public class ContainerNotFoundException extends Exception {
public ContainerNotFoundException() {
super();
}
public ContainerNotFoundException(String message) {
super(message);
}
public ContainerNotFoundException(String message, Throwable cause) {
super(message, cause);
}
public ContainerNotFoundException(Throwable cause) {
super(cause);
}
}
