X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FDevelLauncher.java;h=431b922d298b76137884029b7b04e651db775079;hb=c1cd9ff2a987294dea588bb97ad075da25f547f5;hp=5d1686728378524f39eb7ed416532a06e730642f;hpb=14ce2292d15b5d43a285804991f9b7d94207e274;p=gigi.git diff --git a/src/org/cacert/gigi/DevelLauncher.java b/src/org/cacert/gigi/DevelLauncher.java index 5d168672..431b922d 100644 --- a/src/org/cacert/gigi/DevelLauncher.java +++ b/src/org/cacert/gigi/DevelLauncher.java @@ -14,7 +14,9 @@ import java.lang.reflect.Field; import java.net.URL; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.Collections; import java.util.HashMap; +import java.util.Map; import java.util.Properties; import javax.servlet.http.HttpServletRequest; @@ -54,14 +56,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(); @@ -75,7 +77,7 @@ public class DevelLauncher { instF.setAccessible(true); pageF.setAccessible(true); Object gigi = instF.get(null); - HashMap pages = (HashMap) pageF.get(gigi); + HashMap pages = new HashMap<>((Map) pageF.get(gigi)); pages.put("/manage", new Page("Page-manager") { @Override @@ -103,6 +105,7 @@ public class DevelLauncher { return false; } }); + pageF.set(gigi, Collections.unmodifiableMap(pages)); } catch (ReflectiveOperationException e) { e.printStackTrace(); }