remm 01/11/22 08:48:40
Modified: catalina/src/share/org/apache/naming Tag: tomcat_40_branch
NamingService.java
Log:
- Fix bug 5026.
Submitted by Karsten Thygesen <kay at sonofon.dk>
Revision Changes Path
No revision
No revision
1.1.4.1 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingService.java
Index: NamingService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingService.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- NamingService.java 2000/11/02 06:14:16 1.1
+++ NamingService.java 2001/11/22 16:48:40 1.1.4.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingService.java,v
1.1 2000/11/02 06:14:16 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/02 06:14:16 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingService.java,v
1.1.4.1 2001/11/22 16:48:40 remm Exp $
+ * $Revision: 1.1.4.1 $
+ * $Date: 2001/11/22 16:48:40 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* Implementation of the NamingService JMX MBean.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.4.1 $
*/
public final class NamingService
@@ -196,10 +196,11 @@
oldValue = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
if (oldValue != null) {
oldIcValue = oldValue;
+ } else {
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
+ Constants.Package
+ + ".java.javaURLContextFactory");
}
- System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
- Constants.Package
- + ".java.javaURLContextFactory");
} catch (Throwable t) {
state = STOPPED;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
