Commit a11bd287 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

441: Fix issues related to deployment of upcoming v4-release (OPENED)

Task-Url: #441
parent c05bc745
Pipeline #25692 passed with stage
in 45 seconds
......@@ -33,7 +33,7 @@ public abstract class BaseDmeClient<TBase, TExt> extends BaseApiClientImpl<TBase
protected boolean isSameGrammar(Grammar gCurrent, Grammar gImported) {
if (gCurrent.getGrammarContainer()==null && gImported.getGrammarContainer()==null) {
return true;
} else if (gCurrent.getGrammarContainer()==null && gImported.getGrammarContainer()==null) {
} else if (gCurrent.getGrammarContainer()==null || gImported.getGrammarContainer()==null) {
return false;
}
return this.isSameGrammar(gCurrent.getGrammarContainer(), gImported.getGrammarContainer());
......
......@@ -16,7 +16,7 @@ public class UserDaoImpl extends BaseMongoDaoImpl<User> implements UserDao {
@Override
public User findByUsername(String domain, String username) {
Query q = new Query();
q.addCriteria(Criteria.where("username").is(username));
q.addCriteria(Criteria.where("username").regex("^" + username + "$", "i"));
q.addCriteria(Criteria.where("issuer").is(domain));
return this.findOne(q);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment