diff --git a/src/main/java/com/zaxxer/hikari/util/ClockSource.java b/src/main/java/com/zaxxer/hikari/util/ClockSource.java index 850250cb..221d2fc8 100644 --- a/src/main/java/com/zaxxer/hikari/util/ClockSource.java +++ b/src/main/java/com/zaxxer/hikari/util/ClockSource.java @@ -256,16 +256,16 @@ public interface ClockSource @Override public String elapsedDisplayString(long startTime, long endTime) { - long elapsedMs = elapsedNanos(startTime, endTime); + long elapsedNanos = elapsedNanos(startTime, endTime); - StringBuilder sb = new StringBuilder(elapsedMs < 0 ? "-" : ""); - elapsedMs = Math.abs(elapsedMs); + StringBuilder sb = new StringBuilder(elapsedNanos < 0 ? "-" : ""); + elapsedNanos = Math.abs(elapsedNanos); for (TimeUnit unit : TIMEUNITS_DESCENDING) { - long converted = unit.convert(elapsedMs, NANOSECONDS); + long converted = unit.convert(elapsedNanos, NANOSECONDS); if (converted > 0) { sb.append(converted).append(TIMEUNIT_DISPLAY_VALUES[unit.ordinal()]); - elapsedMs -= NANOSECONDS.convert(converted, unit); + elapsedNanos -= NANOSECONDS.convert(converted, unit); } } diff --git a/src/test/java/com/zaxxer/hikari/mocks/StubConnection.java b/src/test/java/com/zaxxer/hikari/mocks/StubConnection.java index 9c39f486..f96624bd 100644 --- a/src/test/java/com/zaxxer/hikari/mocks/StubConnection.java +++ b/src/test/java/com/zaxxer/hikari/mocks/StubConnection.java @@ -465,7 +465,7 @@ public class StubConnection extends StubBaseConnection implements Connection /** {@inheritDoc} */ public void abort(Executor executor) throws SQLException { - throw new SQLException("Intentianal exception during abort"); + throw new SQLException("Intentional exception during abort"); } /** {@inheritDoc} */