You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/08/25 16:50:03 UTC
svn commit: r688739 -
/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManager.java
Author: ngn
Date: Mon Aug 25 07:50:03 2008
New Revision: 688739
URL: http://svn.apache.org/viewvc?rev=688739&view=rev
Log:
Should fix the issue with write permission matches incorrectly on MySQL (FTPSERVER-168)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManager.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManager.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManager.java?rev=688739&r1=688738&r2=688739&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManager.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManager.java Mon Aug 25 07:50:03 2008
@@ -496,6 +496,12 @@
}
}
+ private boolean isTrue(String s) {
+ return "true".equalsIgnoreCase(s) ||
+ "1".equalsIgnoreCase(s) ||
+ "yes".equalsIgnoreCase(s);
+ }
+
/**
* Get the user object. Fetch the row from the table.
*/
@@ -518,17 +524,16 @@
// populate user object
BaseUser thisUser = null;
- String trueStr = Boolean.TRUE.toString();
if (rs.next()) {
thisUser = new BaseUser();
thisUser.setName(rs.getString(ATTR_LOGIN));
thisUser.setHomeDirectory(rs.getString(ATTR_HOME));
- thisUser.setEnabled(trueStr.equalsIgnoreCase(rs
+ thisUser.setEnabled(isTrue(rs
.getString(ATTR_ENABLE)));
thisUser.setMaxIdleTime(rs.getInt(ATTR_MAX_IDLE_TIME));
List<Authority> authorities = new ArrayList<Authority>();
- if (trueStr.equalsIgnoreCase(rs.getString(ATTR_WRITE_PERM))) {
+ if (isTrue(rs.getString(ATTR_WRITE_PERM))) {
authorities.add(new WritePermission());
}