Title: [2584] trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence: Fixed JNDI testing errors
- Revision
- 2584
- Author
- jgenender
- Date
- 2006-03-25 12:42:36 -0500 (Sat, 25 Mar 2006)
Log Message
Fixed JNDI testing errors
Modified Paths
Diff
Modified: trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/JNDIContext.java (2583 => 2584)
--- trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/JNDIContext.java 2006-03-24 18:12:04 UTC (rev 2583)
+++ trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/JNDIContext.java 2006-03-25 17:42:36 UTC (rev 2584)
@@ -54,6 +54,12 @@
if (name.startsWith("java:"))
name = name.substring(5);
+ if (name.startsWith("/"))
+ name = name.substring(1);
+
+ if (name.length() == 0)
+ return this;
+
CompositeName composite = new CompositeName(name);
String segment = composite.get(0);
@@ -110,6 +116,9 @@
if (name.startsWith("java:"))
name = name.substring(5);
+ if (name.startsWith("/"))
+ name = name.substring(1);
+
if (name.equals(""))
throw new NamingException(name + "is not valid.");
Modified: trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/PersistenceTest.java (2583 => 2584)
--- trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/PersistenceTest.java 2006-03-24 18:12:04 UTC (rev 2583)
+++ trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/PersistenceTest.java 2006-03-25 17:42:36 UTC (rev 2584)
@@ -110,6 +110,7 @@
}
+
private void cleanupJNDI(String jndi) throws Exception {
CompositeName composite = new CompositeName(jndi);
for (int i = composite.size(); i > 0; i--) {
