From 352104afdb0f4236ce0dfeadd18a8ecbbfb36a59 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Mon, 23 Feb 2015 19:08:44 +0000 Subject: [PATCH 1/2] =?UTF-8?q?IMAGING-166:=20ByteSourceImageTest:=20Local?= =?UTF-8?q?=20variable=20hides=20a=20field.=20This=20also=20fixes=20#7=20f?= =?UTF-8?q?rom=20github.=20Thanks=20to=20Michael=20Gro=C3=9F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/commons/proper/imaging/trunk@1661752 13f79535-47bb-0310-9956-ffa450edef68 --- src/changes/changes.xml | 3 +++ .../common/bytesource/ByteSourceImageTest.java | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 3b3cf7191..f743d0261 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -46,6 +46,9 @@ The type attribute can be add,update,fix,remove. + + ByteSourceImageTest: Local variable hides a field + Refactor TagConstants 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 index eb7c2eede..47d452049 100644 --- 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,13 @@ 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(); + bufferedImage = null; final BufferedImage imageBytes = Imaging.getBufferedImage(bytes); assertNotNull(imageBytes); From c75d8e3d11b405fe276550bcf597f0774a355f3b Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Mon, 23 Feb 2015 19:09:29 +0000 Subject: [PATCH 2/2] Remove unnecessary null assignment git-svn-id: https://svn.apache.org/repos/asf/commons/proper/imaging/trunk@1661753 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/imaging/common/bytesource/ByteSourceImageTest.java | 1 - 1 file changed, 1 deletion(-) 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 index 47d452049..e2cec24f8 100644 --- a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java +++ b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java @@ -113,7 +113,6 @@ public void checkGetBufferedImage(final File file, final byte[] bytes) throws Ex assertTrue(bufferedImage.getHeight() > 0); final int imageFileWidth = bufferedImage.getWidth(); final int imageFileHeight = bufferedImage.getHeight(); - bufferedImage = null; final BufferedImage imageBytes = Imaging.getBufferedImage(bytes); assertNotNull(imageBytes);