Author: markt
Date: Wed Aug 31 11:37:53 2016
New Revision: 1758593
URL: http://svn.apache.org/viewvc?rev=1758593&view=rev
Log:
Clean-up
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=1758593&r1=1758592&r2=1758593&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
Wed Aug 31 11:37:53 2016
@@ -280,6 +280,7 @@ public class DataSourceRealm
* @param credentials Password or other credentials to use in
* authenticating this username
*/
+ @Override
public Principal authenticate(String username, String credentials) {
// No user or no credentials
@@ -302,13 +303,6 @@ public class DataSourceRealm
// Acquire a Principal object for this user
return authenticate(dbConnection, username, credentials);
- } catch (SQLException e) {
- // Log the problem for posterity
- containerLog.error(sm.getString("dataSourceRealm.exception"), e);
-
- // Return "not authenticated" for this request
- return (null);
-
} finally {
close(dbConnection);
}
@@ -333,7 +327,7 @@ public class DataSourceRealm
*/
protected Principal authenticate(Connection dbConnection,
String username,
- String credentials) throws
SQLException{
+ String credentials) {
String dbCredentials = getPassword(dbConnection, username);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1758593&r1=1758592&r2=1758593&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Wed Aug
31 11:37:53 2016
@@ -340,6 +340,7 @@ public class JDBCRealm
* @param credentials Password or other credentials to use in
* authenticating this username
*/
+ @Override
public synchronized Principal authenticate(String username, String
credentials) {
// Number of tries is the numebr of attempts to connect to the database
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
