Merge branch 'master' into 10.3.x

This commit is contained in:
Shinsuke Sugaya 2016-10-06 18:20:44 +09:00
commit 850d68bb8e
5 changed files with 10 additions and 7 deletions

View file

@ -736,8 +736,8 @@ public class QueryHelper {
/**
* @param sortFields the sortFields to set
*/
public void setSortFields(final String[] supportedSortFields) {
this.sortFields = supportedSortFields;
public void setSortFields(final String[] sortFields) {
this.sortFields = sortFields;
}
public void addHighlightField(final String field) {

View file

@ -46,7 +46,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CrawlJob {
private static final String REMOTE_DEBUG_OPTIONS = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=127.0.0.1:8000";
private static final String REMOTE_DEBUG_OPTIONS = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=localhost:8000";
private static final Logger logger = LoggerFactory.getLogger(CrawlJob.class);

View file

@ -22,8 +22,8 @@ public class ScheduledJobException extends FessSystemException {
private static final long serialVersionUID = 1L;
/**
* @param message
* @param cause
* @param message Exception message.
* @param cause Root cause for this exception.
*/
public ScheduledJobException(final String message, final Throwable cause) {
super(message, cause);
@ -31,7 +31,7 @@ public class ScheduledJobException extends FessSystemException {
}
/**
* @param message
* @param message Exception message.
*/
public ScheduledJobException(final String message) {
super(message);

View file

@ -420,7 +420,7 @@ public final class ComponentUtil {
/**
* For test purpose only.
*
* @param fessConfig
* @param fessConfig fessConfig instance
*/
public static void setFessConfig(final FessConfig fessConfig) {
ComponentUtil.fessConfig = fessConfig;

View file

@ -114,6 +114,9 @@ public final class KuromojiCSVUtil {
/**
* Quote and escape input value for CSV
*
* @param original Original text.
* @return Escaped text.
*/
public static String quoteEscape(final String original) {
String result = original;