yoavs 2004/08/21 05:29:20
Modified: catalina/src/share/org/apache/naming Tag: TOMCAT_5_0
NamingService.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Fixed 30561 on this branch.
Revision Changes Path
No revision
No revision
1.2.2.1 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingService.java
Index: NamingService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingService.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- NamingService.java 27 Feb 2004 14:58:53 -0000 1.2
+++ NamingService.java 21 Aug 2004 12:29:20 -0000 1.2.2.1
@@ -147,7 +147,7 @@
System.setProperty(Context.URL_PKG_PREFIXES, value);
oldValue = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
- if (oldValue != null) {
+ if ((oldValue != null) && (oldValue.length() > 0)) {
oldIcValue = oldValue;
} else {
System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
No revision
No revision
1.70.2.5 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.4
retrieving revision 1.70.2.5
diff -u -r1.70.2.4 -r1.70.2.5
--- changelog.xml 21 Aug 2004 04:44:37 -0000 1.70.2.4
+++ changelog.xml 21 Aug 2004 12:29:20 -0000 1.70.2.5
@@ -25,6 +25,9 @@
<fix>
<bug>30602</bug>: Subject is not available during the first call to the
servlet which use the basic authentication (jfarcand)
</fix>
+ <fix>
+ <bug>30561</bug>: Broken restart of NamingService. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
