Merge branch 'hotfix/129_website'

Bojo38 · Jun 6, 2017 · e9fa7b4 · e9fa7b4
2 parents 91b9777 + 933884b
commit e9fa7b4
Show file tree

Hide file tree

Showing 4 changed files with 2,035 additions and 2,027 deletions.
diff --git a/src/fi/iki/elonen/NanoHTTPD.java b/src/fi/iki/elonen/NanoHTTPD.java
@@ -781,11 +781,14 @@ public void execute() throws IOException {
                 Response resp = newFixedLengthResponse(Response.Status.INTERNAL_ERROR, NanoHTTPD.MIME_PLAINTEXT, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage());
                 resp.send(this.outputStream);
                 safeClose(this.outputStream);
+                ioe.printStackTrace();
             } catch (ResponseException re) {
                 Response resp = newFixedLengthResponse(re.getStatus(), NanoHTTPD.MIME_PLAINTEXT, re.getMessage());
                 resp.send(this.outputStream);
                 safeClose(this.outputStream);
+                re.printStackTrace();
             } finally {
+
                 safeClose(r);
                 this.tempFileManager.clear();
             }

diff --git a/src/tourma/utils/web/WebPicture.java b/src/tourma/utils/web/WebPicture.java
@@ -23,12 +23,15 @@ public class WebPicture {
 
     public static String getPictureAsHTML(ImageIcon pic, int width, int heigth) {
 
-        BufferedImage bi = new BufferedImage(pic.getIconWidth(), pic.getIconHeight(), BufferedImage.TYPE_INT_ARGB);
-        Graphics g = bi.createGraphics();
-        pic.paintIcon(null, g, 0, 0);
-        g.dispose();
-        return getPictureAsHTML(bi, width, heigth, Tournament.getTournament().getParams().isUseImage());
-
+        if (pic != null) {
+            BufferedImage bi = new BufferedImage(pic.getIconWidth(), pic.getIconHeight(), BufferedImage.TYPE_INT_ARGB);
+            Graphics g = bi.createGraphics();
+            pic.paintIcon(null, g, 0, 0);
+            g.dispose();
+            return getPictureAsHTML(bi, width, heigth, Tournament.getTournament().getParams().isUseImage());
+        } else {
+            return "";
+        }
 
     }