More code analysis fixes

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1517623 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
index 28fecd7..20bd3fe 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
@@ -574,7 +574,7 @@
     }
 
     private void writeChangelogXml( List<ChangeLogSet> changelogList )
-        throws FileNotFoundException, UnsupportedEncodingException, IOException
+        throws IOException
     {
         StringBuilder changelogXml = new StringBuilder();
 
@@ -1373,21 +1373,15 @@
         }
         finally
         {
-            if ( br != null )
+            try
             {
-                try
-                {
-                    br.close();
-                }
-                catch ( IOException e )
-                {
-                    getLog().warn( "Unable to close a reader." );
-                }
+                br.close();
             }
-            if ( sr != null )
+            catch ( IOException e )
             {
-                sr.close();
+                getLog().warn( "Unable to close a reader." );
             }
+            sr.close();
         }
         sink.tableCell_();