Author: solomax
Date: Wed Jul 2 04:42:24 2014
New Revision: 1607242
URL: http://svn.apache.org/r1607242
Log:
[OPENMEETINGS-1032] StackOverflowError while searching is fixed
Modified:
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
Modified:
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java?rev=1607242&r1=1607241&r2=1607242&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java
(original)
+++
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java
Wed Jul 2 04:42:24 2014
@@ -31,7 +31,7 @@ public class DaoHelper {
}
public static String getSearchQuery(String table, String alias, String
join, String search, boolean filterDeleted, boolean count, String
additionalWhere, String sort, String... fields) {
- return getSearchQuery(table, alias, join, search,
filterDeleted, count, additionalWhere, sort, fields);
+ return getSearchQuery(table, alias, join, search, false,
filterDeleted, count, additionalWhere, sort, fields);
}
public static String getSearchQuery(String table, String alias, String
join, String search, boolean distinct, boolean filterDeleted, boolean count,
String additionalWhere, String sort, String... fields) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java?rev=1607242&r1=1607241&r2=1607242&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
Wed Jul 2 04:42:24 2014
@@ -31,7 +31,7 @@ public class DaoHelper {
}
public static String getSearchQuery(String table, String alias, String
join, String search, boolean filterDeleted, boolean count, String
additionalWhere, String sort, String... fields) {
- return getSearchQuery(table, alias, join, search,
filterDeleted, count, additionalWhere, sort, fields);
+ return getSearchQuery(table, alias, join, search, false,
filterDeleted, count, additionalWhere, sort, fields);
}
public static String getSearchQuery(String table, String alias, String
join, String search, boolean distinct, boolean filterDeleted, boolean count,
String additionalWhere, String sort, String... fields) {