From d28c066f53f2abec2b2161a17d9b194c2e00cfcb Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 1 Oct 2019 12:23:10 +0200 Subject: [PATCH] Use an int for the pid in the registry --- src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java | 6 +++--- .../java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java | 4 ++-- .../java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java b/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java index db21c252..45f8b00f 100644 --- a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java +++ b/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java @@ -25,7 +25,7 @@ public class DaemonInfo { private final String uid; private final String javaHome; private final String mavenHome; - private final long pid; + private final int pid; private final int address; private final int idleTimeout; private final String locale; @@ -35,7 +35,7 @@ public class DaemonInfo { private final long lastBusy; public DaemonInfo(String uid, String javaHome, String mavenHome, - long pid, int address, int idleTimeout, + int pid, int address, int idleTimeout, String locale, List options, DaemonState state, long lastIdle, long lastBusy) { this.uid = uid; @@ -63,7 +63,7 @@ public class DaemonInfo { return mavenHome; } - public long getPid() { + public int getPid() { return pid; } diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java b/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java index b539ad3a..35133c6b 100644 --- a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java +++ b/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java @@ -243,7 +243,7 @@ public class DaemonRegistry implements AutoCloseable { String uid = readString(); String javaHome = readString(); String mavenHome = readString(); - long pid = buffer.getLong(); + int pid = buffer.getInt(); int address = buffer.getInt(); int idle = buffer.getInt(); String locale = readString(); @@ -279,7 +279,7 @@ public class DaemonRegistry implements AutoCloseable { writeString(di.getUid()); writeString(di.getJavaHome()); writeString(di.getMavenHome()); - buffer.putLong(di.getPid()); + buffer.putInt(di.getPid()); buffer.putInt(di.getAddress()); buffer.putInt(di.getIdleTimeout()); writeString(di.getLocale()); diff --git a/src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java b/src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java index b86cf7af..fb1e1c68 100644 --- a/src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java +++ b/src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java @@ -43,7 +43,7 @@ public class DaemonRegistryTest { byte[] token = new byte[16]; new Random().nextBytes(token); reg1.store(new DaemonInfo("the-uid", "/java/home/", - "/data/reg/", 0x123456789012l, 7502, 65536, + "/data/reg/", 0x12345678, 7502, 65536, Locale.getDefault().toLanguageTag(), Arrays.asList("-Xmx"), DaemonState.Idle, System.currentTimeMillis(), System.currentTimeMillis()));