Merge pull request #1 from apache/trunk

update from origin
kinow · Feb 24, 2015 · f367517 · f367517
2 parents 979b42f + c75d8e3
commit f367517
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -46,6 +46,9 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
 
     <release version="1.0" date="TBA" description="TBA">
+      <action issue="IMAGING-166" dev="britter" type="update" due-to="Michael Groß">
+        ByteSourceImageTest: Local variable hides a field
+      </action>
       <action issue="IMAGING-156" dev="britter" type="update">
         Refactor TagConstants
       </action>

diff --git a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
@@ -107,13 +107,12 @@ public void test() throws Exception {
     }
 
     public void checkGetBufferedImage(final File file, final byte[] bytes) throws Exception {
-        BufferedImage imageFile = Imaging.getBufferedImage(file);
-        assertNotNull(imageFile);
-        assertTrue(imageFile.getWidth() > 0);
-        assertTrue(imageFile.getHeight() > 0);
-        final int imageFileWidth = imageFile.getWidth();
-        final int imageFileHeight = imageFile.getHeight();
-        imageFile = null;
+        BufferedImage bufferedImage = Imaging.getBufferedImage(file);
+        assertNotNull(bufferedImage);
+        assertTrue(bufferedImage.getWidth() > 0);
+        assertTrue(bufferedImage.getHeight() > 0);
+        final int imageFileWidth = bufferedImage.getWidth();
+        final int imageFileHeight = bufferedImage.getHeight();
 
         final BufferedImage imageBytes = Imaging.getBufferedImage(bytes);
         assertNotNull(imageBytes);