From 6f631fab631ef833fccb8e94bc6aff68dc01430f Mon Sep 17 00:00:00 2001 From: Michael Gorovoy Date: Tue, 25 May 2010 15:54:34 +0000 Subject: [PATCH] 297598 JDBCLoginService uses hardcoded credential class git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1865 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../main/java/org/eclipse/jetty/security/JDBCLoginService.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index b89b85c093b..3193b345e99 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,5 @@ jetty-7.1.3-SNAPSHOT + + 297598 JDBCLoginService uses hardcoded credential class + 305898 Websocket handles query string in URI + 313205 Unable to run test-jdbc-sessions tests diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java index c5d1138cf60..c95c226c61e 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; +import org.eclipse.jetty.http.security.Credential; import org.eclipse.jetty.http.security.Password; import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.util.Loader; @@ -248,7 +249,7 @@ public class JDBCLoginService extends MappedLoginService roles.add(rs.getString(_roleTableRoleField)); stat.close(); - return putUser(username, new Password(credentials),roles.toArray(new String[roles.size()])); + return putUser(username, Credential.getCredential(credentials),roles.toArray(new String[roles.size()])); } } catch (SQLException e)