You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/12/29 07:52:34 UTC
svn commit: r1053545 -
/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
Author: genspring
Date: Wed Dec 29 06:52:33 2010
New Revision: 1053545
URL: http://svn.apache.org/viewvc?rev=1053545&view=rev
Log:
more generic normalization for name to construct the abstractNameQuery.
Modified:
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?rev=1053545&r1=1053544&r2=1053545&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Wed Dec 29 06:52:33 2010
@@ -293,8 +293,8 @@ public abstract class AbstractNamingBuil
}
private static String normalizeJndiName(String name) {
- if (name.indexOf("java:comp/env/") != -1) {
- return name.substring("java:comp/env/".length(), name.length());
+ if (name.startsWith("java:")) {
+ return name.substring(name.indexOf("/env/") + 5);
} else {
return name.trim();
}