Skip to content

Commit

Permalink
[misc] temporary test openjdk7 deletion on travis due to travis-ci/tr…
Browse files Browse the repository at this point in the history
  • Loading branch information
rusher committed Mar 31, 2016
1 parent 2651df1 commit 851578a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ public class MariaSelectResultSet implements ResultSet {
* @param resultSetScrollType one of the following <code>ResultSet</code> constants: <code>ResultSet.TYPE_FORWARD_ONLY</code>,
* <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
* @param fetchSize current fetch size
* @param isCanHaveCallableResultset is it from a callableStatement ?
*/
public MariaSelectResultSet(ColumnInformation[] columnInformation, Statement statement, Protocol protocol,
ReadPacketFetcher fetcher, boolean isBinaryEncoded,
Expand Down Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 851578a

Please sign in to comment.