diff options
| author | Andrew Pinski <pinskia@physics.uc.edu> | 2005-04-22 17:43:50 +0000 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2005-04-22 10:43:50 -0700 |
| commit | 2828ee690f899a083148d402550c686893a422cc (patch) | |
| tree | d79592e245d5e67e6cf2c41ada249b0be36e39a6 /libjava | |
| parent | 1a32490a09a190b47b7c9c8386407505f554dd16 (diff) | |
| download | gcc-2828ee690f899a083148d402550c686893a422cc.zip gcc-2828ee690f899a083148d402550c686893a422cc.tar.gz gcc-2828ee690f899a083148d402550c686893a422cc.tar.bz2 | |
NameFinder.java (close): IN, OUT, and PROC can all be null, check for that case and don't deference it.
2005-04-22 Andrew Pinski <pinskia@physics.uc.edu>
* gnu/gcj/runtime/NameFinder.java (close): IN, OUT, and PROC can all
be null, check for that case and don't deference it.
From-SVN: r98573
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/NameFinder.java | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b85cdf2..1a9c0ba 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-04-22 Andrew Pinski <pinskia@physics.uc.edu> + + * gnu/gcj/runtime/NameFinder.java (close): IN, OUT, and PROC can all + be null, check for that case and don't deference it. + 2005-04-22 Sven de Marothy <sven@physto.se> * java/util/logging/LogManager.java: Reformatted. diff --git a/libjava/gnu/gcj/runtime/NameFinder.java b/libjava/gnu/gcj/runtime/NameFinder.java index 5469f08..4c629bb 100644 --- a/libjava/gnu/gcj/runtime/NameFinder.java +++ b/libjava/gnu/gcj/runtime/NameFinder.java @@ -86,12 +86,14 @@ public class NameFinder { try { - in.close(); - out.close(); + if (in != null) + in.close(); + if (out != null) + out.close(); } catch (IOException x) {} - - proc.destroy(); + if (proc != null) + proc.destroy(); } } |