yoavs 2004/08/21 05:26:56
Modified: catalina/src/share/org/apache/naming NamingService.java
webapps/docs changelog.xml
Log:
Bugzilla 30561, fixed NamingService.
Revision Changes Path
1.3 +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.3
diff -u -r1.2 -r1.3
--- NamingService.java 27 Feb 2004 14:58:53 -0000 1.2
+++ NamingService.java 21 Aug 2004 12:26:56 -0000 1.3
@@ -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,
1.90 +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.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- changelog.xml 11 Aug 2004 16:33:56 -0000 1.89
+++ changelog.xml 21 Aug 2004 12:26:56 -0000 1.90
@@ -70,6 +70,9 @@
<fix>
<bug>30587</bug>: Typo in ExtendedAccessLogValve. (yoavs)
</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]
