Ticket #2411: skinManager-imre.patch

src/main/java/org/sophie2/base/skins/SkinManager.java

@@ -186 +186 @@
         private static void getContents(String skinName, URL partFile,
                         BaseSkinPart skinPart) {
                 SophieLog.info("part file "+ partFile);
+
+                BufferedReader input = null;
                 try {
-                        BufferedReader input = new BufferedReader(
+                        input = new BufferedReader(
                                         new InputStreamReader(partFile.openStream(), "UTF-8"));
-                        try {
-                                String line = null;
-                                while ((line = input.readLine()) != null) {
-                                        if (!line.equals("") && !line.startsWith("#")) {
-                                                initRecord(skinName, skinPart, line);
-                                        }
+
+                        String line = null;
+                        while ((line = input.readLine()) != null) {
+                                String trimmed = line.trim();
+                                if (!trimmed.equals("") && !trimmed.startsWith("#")) {
+                                        initRecord(skinName, skinPart, line);
                                 }
-                        } finally {
-                                input.close();
                         }
+
                 } catch (IOException ex) {
                         throw new RuntimeException(ex);
+                }  finally {
+                        if (input != null) {
+                                try {
+                                        input.close();
+                                } catch (IOException e) {
+                                        throw new RuntimeException(e);
+                                }
+                        }
                 }
         }