Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed potential NullPointException in debug level in MongoQueryCreator.

Browse Source
This commit is contained in:
Oliver Gierke
2011-09-07 15:37:34 +02:00
parent dee0307055
commit 135742b7e4
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoQueryCreator.java
View File

@@ -19,8 +19,6 @@ import static org.springframework.data.mongodb.core.query.Criteria.*;
import java.util.Collection;
import java.util.Iterator;
import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.data.domain.Sort;
@@ -123,6 +121,10 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
*/
@Override
protected Query complete(Query query, Sort sort) {
if (query == null) {
return null;
}
QueryUtils.applySorting(query, sort);
@@ -160,7 +162,7 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
return criteria.in(nextAsArray(parameters));
case LIKE:
String value = parameters.next().toString();
return criteria.is(toLikeRegex(value));
return criteria.regex(toLikeRegex(value));
case NEAR:
Distance distance = accessor.getMaxDistance();
@@ -227,9 +229,8 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Query> {
return new Object[] { next };
}
private Pattern toLikeRegex(String source) {
private String toLikeRegex(String source) {
String regex = source.replaceAll("\\*", ".*");
return Pattern.compile(regex);
return source.replaceAll("\\*", ".*");
}
}