Merge pull request FasterXML#39 from fge/master

Fix two FindBugs items
christophercurrie · Nov 13, 2012 · b47bc9f · b47bc9f
2 parents d6d57e5 + 6ebc759
commit b47bc9f
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 29 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java b/src/main/java/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java
@@ -313,7 +313,7 @@ public static class NopIndenter
     {
         private static final long serialVersionUID = 1L;
 
-        public static NopIndenter instance = new NopIndenter();
+        public static final NopIndenter instance = new NopIndenter();
 
         public NopIndenter() { }
 //      @Override
@@ -332,7 +332,7 @@ public static class FixedSpaceIndenter
     {
         private static final long serialVersionUID = 1L;
 
-        public static FixedSpaceIndenter instance = new FixedSpaceIndenter();
+        public static final FixedSpaceIndenter instance = new FixedSpaceIndenter();
 
         public FixedSpaceIndenter() { }
 
@@ -356,7 +356,7 @@ public static class Lf2SpacesIndenter
     {
         private static final long serialVersionUID = 1L;
 
-        public static Lf2SpacesIndenter instance = new Lf2SpacesIndenter();
+        public static final Lf2SpacesIndenter instance = new Lf2SpacesIndenter();
 
         final static String SYSTEM_LINE_SEPARATOR;
         static {

diff --git a/src/main/java/com/fasterxml/jackson/core/util/VersionUtil.java b/src/main/java/com/fasterxml/jackson/core/util/VersionUtil.java
@@ -65,37 +65,58 @@ protected VersionUtil()
      */
     public static Version versionFor(Class<?> cls)
     {
-        InputStream in;
-        Version version = null;
+        final InputStream in = cls.getResourceAsStream(VERSION_FILE);
+
+        if (in == null)
+            return Version.unknownVersion();
 
         try {
-            in = cls.getResourceAsStream(VERSION_FILE);
-            if (in != null) {
+            InputStreamReader reader = new InputStreamReader(in, "UTF-8");
+            try {
+                return doReadVersion(reader);
+            } finally {
                 try {
-                    BufferedReader br = new BufferedReader(new InputStreamReader(in, "UTF-8"));
-                    String groupStr = null, artifactStr = null;
-                    String versionStr = br.readLine();
-                    if (versionStr != null) {
-                        groupStr = br.readLine();
-                        if (groupStr != null) {
-                            groupStr = groupStr.trim();
-                            artifactStr = br.readLine();
-                            if (artifactStr != null) {
-                                artifactStr = artifactStr.trim();
-                            }
-                        }
-                    }
-                    version = parseVersion(versionStr, groupStr, artifactStr);
-                } finally {
-                    try {
-                        in.close();
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    }
+                    reader.close();
+                } catch (IOException ignored) {
                 }
             }
-        } catch (IOException e) { }
-        return (version == null) ? Version.unknownVersion() : version;
+        } catch (UnsupportedEncodingException e) {
+            return Version.unknownVersion();
+        } finally {
+            try {
+                in.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private static Version doReadVersion(final Reader reader)
+    {
+        String version = null, group = null, artifact = null;
+
+        final BufferedReader br = new BufferedReader(reader);
+        try {
+            version = br.readLine();
+            if (version != null) {
+                group = br.readLine();
+                if (group != null)
+                    artifact = br.readLine();
+            }
+        } catch (IOException ignored) {
+        } finally {
+            try {
+                br.close();
+            } catch (IOException ignored) {
+            }
+        }
+
+        // We don't trim() version: parseVersion() takes care ot that
+        if (group != null)
+            group = group.trim();
+        if (artifact != null)
+            artifact = artifact.trim();
+        return parseVersion(version, group, artifact);
     }
 
     /**