X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FDevelLauncher.java;h=5e0235939ea5b80fb1b0f392a3d8a65fd480f751;hb=d2a1e35d319f56baf28f8e96d7fb2da154b4aa3b;hp=2cc7f6348bb1900e0853a1654c1683d4a43d4919;hpb=638ef2a38b676d8bb919d25ce9ce092d6ecbd3fe;p=gigi.git diff --git a/src/org/cacert/gigi/DevelLauncher.java b/src/org/cacert/gigi/DevelLauncher.java index 2cc7f634..5e023593 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]); @@ -56,17 +58,17 @@ public class DevelLauncher { dos.flush(); InputStream oldin = System.in; System.setIn(new ByteArrayInputStream(chunkConfig.toByteArray())); - Launcher.main(args); + 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(); System.exit(0); } - private static void addDevelPage() { + public static void addDevelPage() { try { Field instF = Gigi.class.getDeclaredField("instance"); Field pageF = Gigi.class.getDeclaredField("pages");