Author: markt Date: Thu Mar 8 21:25:31 2012 New Revision: 1298590 URL: http://svn.apache.org/viewvc?rev=1298590&view=rev Log: Fix various Checkstyle / Eclipse warnings and failures
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298590&r1=1298589&r2=1298590&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Mar 8 21:25:31 2012 @@ -1068,7 +1068,7 @@ public abstract class RealmBase extends if (container != null) { this.containerLog = container.getLogger(); } - + x509UsernameRetriever = createUsernameRetriever(x509UsernameRetrieverClassName); } @@ -1440,7 +1440,7 @@ public abstract class RealmBase extends try { @SuppressWarnings("unchecked") Class<? extends X509UsernameRetriever> clazz = (Class<? extends X509UsernameRetriever>)Class.forName(className); - return (X509UsernameRetriever)clazz.newInstance(); + return clazz.newInstance(); } catch (ClassNotFoundException e) { throw new LifecycleException(sm.getString("realmBase.createUsernameRetriever.ClassNotFoundException", className), e); } catch (InstantiationException e) { Modified: tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java?rev=1298590&r1=1298589&r2=1298590&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java Thu Mar 8 21:25:31 2012 @@ -22,8 +22,9 @@ import java.security.cert.X509Certificat * An X509UsernameRetriever that returns a certificate's entire * SubjectDN as the username. */ -public class X509SubjectDnRetriever - implements X509UsernameRetriever { +public class X509SubjectDnRetriever implements X509UsernameRetriever { + + @Override public String getUsername(X509Certificate clientCert) { return clientCert.getSubjectDN().getName(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org