Return-Path: 
 <commits-return-13626-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: (qmail 56611 invoked from network); 10 Sep 2010 00:47:28 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 10 Sep 2010 00:47:28 -0000
Received: (qmail 2226 invoked by uid 500); 10 Sep 2010 00:47:27 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 2165 invoked by uid 500); 10 Sep 2010 00:47:27 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 2158 invoked by uid 99); 10 Sep 2010 00:47:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Sep 2010 00:47:27 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Sep 2010 00:47:26 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 724062388A1C; Fri, 10 Sep 2010 00:47:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r995621 - in
 /commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg:
 iptc/IptcUpdateTest.java xmp/JpegXmpRewriteTest.java
Date: Fri, 10 Sep 2010 00:47:06 -0000
To: commits@commons.apache.org
From: sebb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100910004706.724062388A1C@eris.apache.org>

Author: sebb
Date: Fri Sep 10 00:47:06 2010
New Revision: 995621

URL: http://svn.apache.org/viewvc?rev=995621&view=rev
Log:
Avoid potential NPEs

Modified:
    commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
    commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpRewriteTest.java

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcUpdateTest.java?rev=995621&r1=995620&r2=995621&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcUpdateTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcUpdateTest.java Fri Sep 10 00:47:06 2010
@@ -95,7 +95,9 @@ public class IptcUpdateTest extends Iptc
 					new JpegIptcRewriter().removeIPTC(byteSource, os);
 				} finally
 				{
-					os.close();
+				    if (os != null) {
+				        os.close();
+				    }
 					os = null;
 				}
 
@@ -152,7 +154,9 @@ public class IptcUpdateTest extends Iptc
 					new JpegIptcRewriter().removeIPTC(byteSource, os);
 				} finally
 				{
-					os.close();
+                    if (os != null) {
+                        os.close();
+                    }
 					os = null;
 				}
 
@@ -197,7 +201,9 @@ public class IptcUpdateTest extends Iptc
 					new JpegIptcRewriter().writeIPTC(byteSource, os, newData);
 				} finally
 				{
-					os.close();
+                    if (os != null) {
+                        os.close();
+                    }
 					os = null;
 				}
 
@@ -241,7 +247,9 @@ public class IptcUpdateTest extends Iptc
 					new JpegIptcRewriter().writeIPTC(byteSource, os, newData);
 				} finally
 				{
-					os.close();
+                    if (os != null) {
+                        os.close();
+                    }
 					os = null;
 				}
 
@@ -286,7 +294,9 @@ public class IptcUpdateTest extends Iptc
 							noIptcFile), os, newData);
 				} finally
 				{
-					os.close();
+                    if (os != null) {
+                        os.close();
+                    }
 					os = null;
 				}
 
@@ -385,7 +395,9 @@ public class IptcUpdateTest extends Iptc
 					new JpegIptcRewriter().writeIPTC(byteSource, os, newData);
 				} finally
 				{
-					os.close();
+                    if (os != null) {
+                        os.close();
+                    }
 					os = null;
 				}
 

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpRewriteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpRewriteTest.java?rev=995621&r1=995620&r2=995621&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpRewriteTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpRewriteTest.java Fri Sep 10 00:47:06 2010
@@ -75,7 +75,9 @@ public class JpegXmpRewriteTest extends 
 					new JpegXmpRewriter().removeXmpXml(byteSource, os);
 				} finally
 				{
-					os.close();
+					if (os != null) {
+					    os.close();
+					}
 					os = null;
 				}
 
@@ -101,7 +103,9 @@ public class JpegXmpRewriteTest extends 
 							newXmpXml);
 				} finally
 				{
-					os.close();
+				    if (os != null) {
+				        os.close();
+				    }
 					os = null;
 				}
 
@@ -128,7 +132,9 @@ public class JpegXmpRewriteTest extends 
 							newXmpXml);
 				} finally
 				{
-					os.close();
+				    if (os != null) {
+				        os.close();
+				    }
 					os = null;
 				}