diff --git a/.travis.yml b/.travis.yml index c93152106..4446a9b14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ install: .travis/before_test.sh jdk: - oraclejdk8 - oraclejdk7 - - openjdk7 env: - MARIA_VERSION=5.5 MAX_ALLOWED_PACKET=8M INNODB_LOG_FILE_SIZE=80M - MARIA_VERSION=5.5 MAX_ALLOWED_PACKET=20M INNODB_LOG_FILE_SIZE=200M diff --git a/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java b/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java index 0511dc965..634dbbae5 100644 --- a/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java +++ b/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java @@ -127,6 +127,7 @@ public class MariaSelectResultSet implements ResultSet { * @param resultSetScrollType one of the following ResultSet constants: ResultSet.TYPE_FORWARD_ONLY, * ResultSet.TYPE_SCROLL_INSENSITIVE, or ResultSet.TYPE_SCROLL_SENSITIVE * @param fetchSize current fetch size + * @param isCanHaveCallableResultset is it from a callableStatement ? */ public MariaSelectResultSet(ColumnInformation[] columnInformation, Statement statement, Protocol protocol, ReadPacketFetcher fetcher, boolean isBinaryEncoded, @@ -3430,7 +3431,7 @@ private int extractNanos(String timestring) throws ParseException { /** * Get inputStream value from raw data. - * + * @param rawBytes rowdata * @return inputStream */ public InputStream getInputStream(byte[] rawBytes) { diff --git a/src/main/java/org/mariadb/jdbc/internal/util/scheduler/DynamicSizedSchedulerInterface.java b/src/main/java/org/mariadb/jdbc/internal/util/scheduler/DynamicSizedSchedulerInterface.java index e18e109e5..0030450a8 100644 --- a/src/main/java/org/mariadb/jdbc/internal/util/scheduler/DynamicSizedSchedulerInterface.java +++ b/src/main/java/org/mariadb/jdbc/internal/util/scheduler/DynamicSizedSchedulerInterface.java @@ -85,6 +85,8 @@ public interface DynamicSizedSchedulerInterface extends ScheduledExecutorService * task. Once the task completes the pool size will be adjusted back down. * * @param task Task to be executed + * @param delay delay before execution + * @param unit unit of delay * @return Future which represents task execution */ public Future addThreadAndSchedule(Runnable task, long delay, TimeUnit unit);