Commit 22d4813e authored by Tony Mancill's avatar Tony Mancill
Browse files

New upstream version 1.16.25

parent 4107e9aa

benchmarks/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
            <dependency>

                <groupId>net.openhft</groupId>

                <artifactId>chronicle-bom</artifactId>

                <version>1.16.161</version>

                <version>1.16.167</version>

                <type>pom</type>

                <scope>import</scope>

            </dependency>

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    </parent>

    <modelVersion>4.0.0</modelVersion>

    <artifactId>chronicle-core</artifactId>

    <version>1.16.24</version>

    <version>1.16.25</version>

    <name>OpenHFT/Chronicle-Core</name>

    <description>Chronicle-Core</description>

    <packaging>bundle</packaging>
@@ -273,7 +273,7 @@ 
        <connection>scm:git:git@github.com:OpenHFT/Chronicle-Core.git</connection>

        <developerConnection>scm:git:git@github.com:OpenHFT/Chronicle-Core.git

        </developerConnection>

        <tag>chronicle-core-1.16.24</tag>

        <tag>chronicle-core-1.16.25</tag>

    </scm>



</project>

src/main/java/net/openhft/chronicle/core/StackTrace.java

+3 −2
Original line number Diff line number Diff line
@@ -9,13 +9,14 @@ package net.openhft.chronicle.core; 
 */

public class StackTrace extends Throwable {

    public StackTrace() {

        this(null);

    }



    public StackTrace(String message) {

        super(message);

        this(message, null);

    }



    public StackTrace(String message, Throwable cause) {

        super(message, cause);

        super(message, cause, false, false);

    }

}

src/main/java/net/openhft/chronicle/core/time/SystemTimeProvider.java

+0 −4
Original line number Diff line number Diff line
@@ -16,16 +16,12 @@ 


package net.openhft.chronicle.core.time;



import java.util.concurrent.atomic.AtomicReference;



/*

 * Created by Peter Lawrey on 10/03/16.

 */

public enum SystemTimeProvider implements TimeProvider {

    INSTANCE;



    static final AtomicReference<TimeProvider> TIME_PROVIDER = new AtomicReference<>(INSTANCE);



    static {

        // warmUp()

        for (int i = 0; i < 1000; i++)

src/main/java/net/openhft/chronicle/core/time/TimeProvider.java

+11 −10
Original line number Diff line number Diff line
@@ -18,18 +18,12 @@ package net.openhft.chronicle.core.time; 


import java.util.concurrent.TimeUnit;



import static net.openhft.chronicle.core.time.SystemTimeProvider.TIME_PROVIDER;



/*

 * Created by Peter Lawrey on 10/03/16.

 */

@FunctionalInterface

public interface TimeProvider {



    static TimeProvider get() {

        return TIME_PROVIDER.get();

    }



    long currentTimeMillis();



    default long currentTimeMicros() {
@@ -37,12 +31,19 @@ public interface TimeProvider { 
    }



    default long currentTimeNanos() {

        return currentTimeMillis() * 1000000;

        return currentTimeMicros() * 1000;

    }



    default long currentTime(TimeUnit timeUnit) {

        return timeUnit == TimeUnit.MILLISECONDS

                ? currentTimeMillis()

                : timeUnit.convert(currentTimeNanos(), TimeUnit.NANOSECONDS);

        switch (timeUnit) {

            case NANOSECONDS:

                return currentTimeNanos();

            case MICROSECONDS:

                return currentTimeMicros();

            case MILLISECONDS:

                return currentTimeMillis();

            default:

                return timeUnit.convert(currentTimeMillis(), TimeUnit.MILLISECONDS);

        }

    }

}