ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Added conditions for some robustness

Browse source
This commit is contained in:
Ziver Koc 2015-12-11 23:53:24 +01:00
parent 930ad2b2f3
commit 31c700b738
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Zutil.jar
View file

Binary file not shown.

4
src/zutil/net/http/HttpServer.java Normal file → Executable file
View file

@ -231,7 +231,7 @@ public class HttpServer extends ThreadedTCPNetworkServer{
out.setHeader( "Content-Type", "text/html" ); out.setHeader( "Content-Type", "text/html" );
out.setCookie( "session_id", ""+client_session.get("session_id") ); out.setCookie( "session_id", ""+client_session.get("session_id") );
if( !parser.getRequestURL().isEmpty() && pages.containsKey(parser.getRequestURL()) ){ if( parser.getRequestURL() != null && !parser.getRequestURL().isEmpty() && pages.containsKey(parser.getRequestURL()) ){
pages.get(parser.getRequestURL()).respond(out, parser, client_session, cookie, request); pages.get(parser.getRequestURL()).respond(out, parser, client_session, cookie, request);
logRequest(parser, client_session, cookie, request, time); logRequest(parser, client_session, cookie, request, time);
} }
@ -247,7 +247,7 @@ public class HttpServer extends ThreadedTCPNetworkServer{
//******************************************************************************** //********************************************************************************
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.WARNING, "500 Internal Server Error", e); logger.log(Level.SEVERE, "500 Internal Server Error", e);
try { try {
if (!out.isHeaderSent()) if (!out.isHeaderSent())
out.setStatusCode(500); out.setStatusCode(500);

2
src/zutil/parser/Templator.java
View file

@ -101,6 +101,8 @@ public class Templator {
* be regenerated if the file changes. * be regenerated if the file changes.
*/ */
public Templator(File tmpl) throws IOException { public Templator(File tmpl) throws IOException {
if(tmpl == null)
throw new IllegalArgumentException("File can not be null!");
this.data = new HashMap<String, Object>(); this.data = new HashMap<String, Object>();
this.file = tmpl; this.file = tmpl;
parseTemplate(FileUtil.getContent(file)); parseTemplate(FileUtil.getContent(file));