Unverified 提交 d5714322 authored 作者: Noel Grandin's avatar Noel Grandin 提交者: GitHub

Merge pull request #886 from katzyn/misc

Fix building of documentation
...@@ -120,6 +120,8 @@ public final class GeneratedKeys { ...@@ -120,6 +120,8 @@ public final class GeneratedKeys {
/** /**
* Returns generated keys. * Returns generated keys.
* *
* @param session
* session
* @return local result with generated keys * @return local result with generated keys
*/ */
public LocalResult getKeys(Session session) { public LocalResult getKeys(Session session) {
......
...@@ -215,7 +215,7 @@ public class ToDateParser { ...@@ -215,7 +215,7 @@ public class ToDateParser {
this.minute = minute; this.minute = minute;
} }
void setSecord(int second) { void setSecond(int second) {
this.second = second; this.second = second;
} }
......
...@@ -389,7 +389,7 @@ class ToDateTokenizer { ...@@ -389,7 +389,7 @@ class ToDateTokenizer {
inputFragmentStr = matchStringOrThrow( inputFragmentStr = matchStringOrThrow(
PATTERN_TWO_DIGITS_OR_LESS, params, formatTokenEnum); PATTERN_TWO_DIGITS_OR_LESS, params, formatTokenEnum);
dateNr = Integer.parseInt(inputFragmentStr); dateNr = Integer.parseInt(inputFragmentStr);
params.setSecord(dateNr); params.setSecond(dateNr);
break; break;
case SSSSS: { case SSSSS: {
inputFragmentStr = matchStringOrThrow(PATTERN_NUMBER, params, inputFragmentStr = matchStringOrThrow(PATTERN_NUMBER, params,
...@@ -402,7 +402,7 @@ class ToDateTokenizer { ...@@ -402,7 +402,7 @@ class ToDateTokenizer {
int hour = dateNr % 24; int hour = dateNr % 24;
params.setHour(hour); params.setHour(hour);
params.setMinute(minute); params.setMinute(minute);
params.setSecord(second); params.setSecond(second);
break; break;
} }
case FF: case FF:
......
...@@ -1453,9 +1453,9 @@ public abstract class TestBase { ...@@ -1453,9 +1453,9 @@ public abstract class TestBase {
* *
* @return the path to java * @return the path to java
*/ */
private String getJVM() { private static String getJVM() {
return System.getProperty("java.home") + File.separatorChar + "bin" + return System.getProperty("java.home") + File.separatorChar + "bin"
File.separator + "java"; + File.separator + "java";
} }
/** /**
...@@ -1702,7 +1702,7 @@ public abstract class TestBase { ...@@ -1702,7 +1702,7 @@ public abstract class TestBase {
} }
public ProcessBuilder buildChild(String name, Class<? extends TestBase> childClass, public ProcessBuilder buildChild(String name, Class<? extends TestBase> childClass,
String... jvmArgs) { String... jvmArgs) {
List<String> args = new ArrayList<>(16); List<String> args = new ArrayList<>(16);
args.add(getJVM()); args.add(getJVM());
Collections.addAll(args, jvmArgs); Collections.addAll(args, jvmArgs);
......
...@@ -765,4 +765,4 @@ jacoco xdata invokes sourcefiles classfiles duplication crypto stacktraces prt d ...@@ -765,4 +765,4 @@ jacoco xdata invokes sourcefiles classfiles duplication crypto stacktraces prt d
interpolated thead interpolated thead
die weekdiff osx subprocess dow proleptic microsecond microseconds divisible cmp denormalized suppressed saturated mcs die weekdiff osx subprocess dow proleptic microsecond microseconds divisible cmp denormalized suppressed saturated mcs
london london dfs weekdays intermittent looked
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论