X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FDevelLauncher.java;h=fe19ebd479250362b90e22afa29927f34ae1be4c;hb=226dd3a5e589ad8269585a0767819619166eebf4;hp=6a462f21ccae7a7a5a9d394049d6537dd960f442;hpb=3fe883ddebca5de19caf5ef68c492db7eb6dc342;p=gigi.git diff --git a/src/org/cacert/gigi/DevelLauncher.java b/src/org/cacert/gigi/DevelLauncher.java index 6a462f21..fe19ebd4 100644 --- a/src/org/cacert/gigi/DevelLauncher.java +++ b/src/org/cacert/gigi/DevelLauncher.java @@ -32,7 +32,9 @@ public class DevelLauncher { public static void main(String[] args) throws Exception { Properties mainProps = new Properties(); - mainProps.load(new FileInputStream("config/gigi.properties")); + try (FileInputStream inStream = new FileInputStream("config/gigi.properties")) { + mainProps.load(inStream); + } for (int i = 0; i < args.length; i++) { if (args[i].equals("--port")) { mainProps.setProperty("port", args[i + 1]); @@ -52,14 +54,14 @@ public class DevelLauncher { byte[] cacerts = Files.readAllBytes(Paths.get("config/cacerts.jks")); byte[] keystore = Files.readAllBytes(Paths.get("config/keystore.pkcs12")); - DevelLauncher.writeGigiConfig(dos, "changeit".getBytes(), "changeit".getBytes(), mainProps, cacerts, keystore); + DevelLauncher.writeGigiConfig(dos, "changeit".getBytes("UTF-8"), "changeit".getBytes("UTF-8"), mainProps, cacerts, keystore); dos.flush(); InputStream oldin = System.in; System.setIn(new ByteArrayInputStream(chunkConfig.toByteArray())); Launcher.boot(); addDevelPage(); System.setIn(oldin); - BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); + BufferedReader br = new BufferedReader(new InputStreamReader(System.in, "UTF-8")); System.out.println("Cacert-gigi system sucessfully started."); System.out.println("Press enter to shutdown."); br.readLine();