Author: markt
Date: Mon Feb 8 16:45:08 2010
New Revision: 907720
URL: http://svn.apache.org/viewvc?rev=907720&view=rev
Log:
Avoid adding the package twice
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=907720&r1=907719&r2=907720&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Feb 8
16:45:08 2010
@@ -581,13 +581,19 @@
server.addLifecycleListener(new NamingContextListener());
System.setProperty("catalina.useNaming", "true");
+
String value = "org.apache.naming";
String oldValue =
System.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
if (oldValue != null) {
- value = value + ":" + oldValue;
+ if (oldValue.contains(value)) {
+ value = value + ":" + oldValue;
+ } else {
+ value = oldValue;
+ }
}
System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, value);
+
value = System.getProperty
(javax.naming.Context.INITIAL_CONTEXT_FACTORY);
if (value == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
