So... seems like we both push to master. #3

Merged
alisolarflare merged 3 commits from master into dev 2017-06-10 07:25:12 +00:00
2 changed files with 6 additions and 1 deletions

View file

@ -42,7 +42,7 @@ public class ButtonWebsiteModule extends JavaPlugin {
String certfile = "domain-chain.crt"; /* your cert path */ String certfile = "domain-chain.crt"; /* your cert path */
File keystoreFile = new File("keystore.keystore"); File keystoreFile = new File("keystore.keystore");
ks.load(keystoreFile.exists() ? new FileInputStream(keystoreFile) : null, "somepass".toCharArray()); ks.load(keystoreFile.exists() ? new FileInputStream(keystoreFile) : null, password);
String alias = "chroma"; String alias = "chroma";

View file

@ -12,4 +12,9 @@ public class Response {
this.content = content; this.content = content;
this.exchange = exchange; this.exchange = exchange;
} }
public Response(int code, String[] content, HttpExchange exchange) {
this.code = code;
this.content = String.join("", content);
this.exchange = exchange;
}
} }