From dc8100463d3c5fbbab209d02d927d1da512ba796 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 24 Jul 2003 12:53:35 +0000
Subject: [PATCH] Fix potential NPEs

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274920 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/KeySubst.java  |  4 ++--
 .../ant/types/selectors/ContainsRegexpSelector.java   | 11 +++++++----
 .../tools/ant/types/selectors/ContainsSelector.java   | 11 +++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
index 60fdfe3a7..1b5fbc2d9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
+++ b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000,2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000,2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,7 +123,7 @@ public class KeySubst extends Task {
                     // ignore
                 }
             }
-            if (bw != null) {
+            if (br != null) {
                 try {
                     br.close();
                 } catch (IOException e) {
diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
index fcde192c8..79b807bde 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
@@ -172,10 +172,13 @@ public class ContainsRegexpSelector extends BaseExtendSelector {
         } catch (IOException ioe) {
             throw new BuildException("Could not read file " + filename);
         } finally {
-            try {
-                in.close();
-            } catch (Exception e) {
-                throw new BuildException("Could not close file " + filename);
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (Exception e) {
+                    throw new BuildException("Could not close file " 
+                                             + filename);
+                }
             }
         }
     }
diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
index 3a3d705e2..1b12b5ffd 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
@@ -214,10 +214,13 @@ public class ContainsSelector extends BaseExtendSelector {
         } catch (IOException ioe) {
             throw new BuildException("Could not read file " + filename);
         } finally {
-            try {
-                in.close();
-            } catch (Exception e) {
-                throw new BuildException("Could not close file " + filename);
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (Exception e) {
+                    throw new BuildException("Could not close file " 
+                                             + filename);
+                }
             }
         }
     }