You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/11/20 12:57:23 UTC
svn commit: r1815800 - in /tomcat/trunk:
java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
webapps/docs/changelog.xml
Author: markt
Date: Mon Nov 20 12:57:22 2017
New Revision: 1815800
URL: http://svn.apache.org/viewvc?rev=1815800&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61778
Correct the return value when detaching a JASPIC RegistrationListener.
Patch provided by Lazar.
This closes #86
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java?rev=1815800&r1=1815799&r2=1815800&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java Mon Nov 20 12:57:22 2017
@@ -454,6 +454,7 @@ public class AuthConfigFactoryImpl exten
for (RegistrationListenerWrapper wrapper : listeners) {
if (wrapper.getListener().equals(listener)) {
listeners.remove(wrapper);
+ result = true;
}
}
return result;
Modified: tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java?rev=1815800&r1=1815799&r2=1815800&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java (original)
+++ tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java Mon Nov 20 12:57:22 2017
@@ -259,6 +259,21 @@ public class TestAuthConfigFactoryImpl {
}
+ @Test
+ public void testDetachListener() {
+ AuthConfigFactory factory = new AuthConfigFactoryImpl();
+ AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
+ String registrationId = factory.registerConfigProvider(acp1, "L_1", "AC_1", null);
+
+ SimpleRegistrationListener listener1 = new SimpleRegistrationListener("L_1", "AC_1");
+ factory.getConfigProvider("L_1", "AC_1", listener1);
+
+ String[] registrationIds = factory.detachListener(listener1, "L_1", "AC_1");
+ Assert.assertTrue(registrationIds.length == 1);
+ Assert.assertEquals(registrationId, registrationIds[0]);
+ }
+
+
private static class SimpleRegistrationListener implements RegistrationListener {
private final String layer;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1815800&r1=1815799&r2=1815800&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 20 12:57:22 2017
@@ -87,6 +87,10 @@
detaching a JASPIC <code>RegistrationListener</code>. Patch provided by
Lazar. (markt)
</fix>
+ <fix>
+ <bug>61778</bug>: Correct the return value when detaching a JASPIC
+ <code>RegistrationListener</code>. Patch provided by Lazar. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org