From 5fa0bb1fa6df60165cf923c73b3185c7a2057fbb Mon Sep 17 00:00:00 2001 From: alron Date: Sat, 12 Mar 2011 01:23:19 -0800 Subject: [PATCH 1/5] Bleh, Old Permissions. Bleh, hardcoded artifact location. --- pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c67d553d..37ae2884 100644 --- a/pom.xml +++ b/pom.xml @@ -37,11 +37,9 @@ - com.nijikokun.bukkit.Permissions.Permissions + com.nijikokun.bukkit.Permissions Permissions - 2.1 - system - ${project.basedir}/../Permissions.jar + 2.5.4 org.bukkit From 0007acd05bb5577ad7a8f2e98953ec7177957fea Mon Sep 17 00:00:00 2001 From: alron Date: Sat, 12 Mar 2011 01:33:30 -0800 Subject: [PATCH 2/5] Close potential filedescriptor leak. --- .../web/handlers/ClientConfigurationHandler.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java b/src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java index 3117d0e2..5ac5ef16 100644 --- a/src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java +++ b/src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java @@ -1,6 +1,7 @@ package org.dynmap.web.handlers; import java.io.BufferedOutputStream; +import java.io.IOException; import java.util.Date; import java.util.Map; @@ -32,8 +33,15 @@ public class ClientConfigurationHandler implements HttpHandler { response.fields.put("Content-Length", Integer.toString(cachedConfiguration.length)); response.status = HttpStatus.OK; - BufferedOutputStream out = new BufferedOutputStream(response.getBody()); - out.write(cachedConfiguration); - out.flush(); + BufferedOutputStream out = null; + try { + out = new BufferedOutputStream(response.getBody()); + out.write(cachedConfiguration); + out.flush(); + } + finally + { + out.close(); + } } } From 77cc1a70c4bb572af7211d0c28b12d3453690155 Mon Sep 17 00:00:00 2001 From: alron Date: Sat, 12 Mar 2011 01:35:07 -0800 Subject: [PATCH 3/5] Close potential filedescriptor leak. --- .../dynmap/web/handlers/ClientUpdateHandler.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java b/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java index 24d41d5a..ff0ed7ca 100644 --- a/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java +++ b/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java @@ -87,8 +87,15 @@ public class ClientUpdateHandler implements HttpHandler { response.fields.put(HttpField.ContentLength, Integer.toString(bytes.length)); response.status = HttpStatus.OK; - BufferedOutputStream out = new BufferedOutputStream(response.getBody()); - out.write(bytes); - out.flush(); + BufferedOutputStream out = null; + try { + out = new BufferedOutputStream(response.getBody()); + out.write(bytes); + out.flush(); + } + finally + { + out.close(); + } } } \ No newline at end of file From 57c952a1cd94ddaf62a7a8b8588985022b98ea1e Mon Sep 17 00:00:00 2001 From: alron Date: Sat, 12 Mar 2011 01:36:43 -0800 Subject: [PATCH 4/5] oops, didn't need that ^^ --- .../java/org/dynmap/web/handlers/ClientConfigurationHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java b/src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java index 5ac5ef16..09f6d88b 100644 --- a/src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java +++ b/src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java @@ -1,7 +1,6 @@ package org.dynmap.web.handlers; import java.io.BufferedOutputStream; -import java.io.IOException; import java.util.Date; import java.util.Map; From 19a7dba61352a47f4f7aa91fc203d36eaafe72c8 Mon Sep 17 00:00:00 2001 From: alron Date: Sat, 12 Mar 2011 01:38:34 -0800 Subject: [PATCH 5/5] Doesn't change anywhere? Probably should be final. --- src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java b/src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java index f24dbbce..766869b0 100644 --- a/src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java +++ b/src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java @@ -14,7 +14,7 @@ import org.dynmap.ColorScheme; import org.dynmap.debug.Debug; public class DefaultTileRenderer implements MapTileRenderer { - protected static Color translucent = new Color(0, 0, 0, 0); + protected static final Color translucent = new Color(0, 0, 0, 0); private String name; protected int maximumHeight = 127; private ColorScheme colorScheme;