Author: kkolinko Date: Wed Nov 14 09:53:04 2012 New Revision: 1409127 URL: http://svn.apache.org/viewvc?rev=1409127&view=rev Log: Revert additional of "final" modifiers to BaseDirContext.List() that was done in r1392099.
It was an API change that breaks compilation of derived classes. Especially the change of an abstract method into a final one. This class is already removed from trunk, so no need to follow up there. Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=1409127&r1=1409126&r2=1409127&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java Wed Nov 14 09:53:04 2012 @@ -659,7 +659,7 @@ public abstract class BaseDirContext imp * @exception NamingException if a naming exception is encountered */ @Override - public final NamingEnumeration<NameClassPair> list(Name name) + public NamingEnumeration<NameClassPair> list(Name name) throws NamingException { return list(name.toString()); } @@ -675,7 +675,7 @@ public abstract class BaseDirContext imp * @exception NamingException if a naming exception is encountered */ @Override - public final NamingEnumeration<NameClassPair> list(String name) + public NamingEnumeration<NameClassPair> list(String name) throws NamingException { if (!aliases.isEmpty()) { Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1409127&r1=1409126&r2=1409127&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Nov 14 09:53:04 2012 @@ -153,6 +153,10 @@ from 2 to 3 by default and make the limit configurable via a system property. (markt) </fix> + <fix> + Revert occasional API change in <code>BaseDirContext</code> class that + was done in 7.0.32. Methods should not be <code>final</code>. (kkolinko) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org