Author: dblevins
Date: Sat Jun 30 12:23:11 2007
New Revision: 552201
URL: http://svn.apache.org/viewvc?view=rev&rev=552201
Log:
Keep starting even if java:openejb/Resource isn't found
Modified:
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
Modified:
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java?view=diff&rev=552201&r1=552200&r2=552201
==============================================================================
---
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
(original)
+++
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
Sat Jun 30 12:23:11 2007
@@ -33,6 +33,8 @@
import javax.naming.Binding;
import javax.naming.InitialContext;
import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.NameNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -88,26 +90,30 @@
boolean disabled =
Boolean.parseBoolean(properties.getProperty("disabled"));
if (!disabled) {
- NamingEnumeration<Binding> bindings = new
InitialContext().listBindings("java:openejb/Resource/");
- int dbIndex = 0;
- for (Binding binding : Collections.list(bindings)) {
- Object value = binding.getObject();
- if (value instanceof ConnectorReference) {
- Object connectionFactory =
((ConnectorReference)value).getObject();
- if (connectionFactory instanceof JdbcConnectionFactory) {
- JdbcConnectionFactory jdbc = (JdbcConnectionFactory)
connectionFactory;
- String path = getPath(jdbc);
- if (path != null) {
- if (dbIndex > 9) {
- throw new ServiceException("Hsql Server can
only host 10 database connections");
+ NamingEnumeration<Binding> bindings = null;
+ try {
+ bindings = new
InitialContext().listBindings("java:openejb/Resource/");
+ int dbIndex = 0;
+ for (Binding binding : Collections.list(bindings)) {
+ Object value = binding.getObject();
+ if (value instanceof ConnectorReference) {
+ Object connectionFactory =
((ConnectorReference)value).getObject();
+ if (connectionFactory instanceof
JdbcConnectionFactory) {
+ JdbcConnectionFactory jdbc =
(JdbcConnectionFactory) connectionFactory;
+ String path = getPath(jdbc);
+ if (path != null) {
+ if (dbIndex > 9) {
+ throw new ServiceException("Hsql Server
can only host 10 database connections");
+ }
+ String dbname =
path.substring(path.lastIndexOf('/') + 1);
+ properties.put(ServerConstants.SC_KEY_DBNAME +
"." + dbIndex, dbname);
+ properties.put(ServerConstants.SC_KEY_DATABASE
+ "." + dbIndex, path);
+ dbIndex++;
}
- String dbname =
path.substring(path.lastIndexOf('/') + 1);
- properties.put(ServerConstants.SC_KEY_DBNAME + "."
+ dbIndex, dbname);
- properties.put(ServerConstants.SC_KEY_DATABASE +
"." + dbIndex, path);
- dbIndex++;
}
}
}
+ } catch (NameNotFoundException e) {
}
// create the server
