From 87626b3864d773614a32c941ac1aad6b122108c7 Mon Sep 17 00:00:00 2001 From: pinskia Date: Fri, 22 Apr 2005 17:43:50 +0000 Subject: [PATCH] 2005-04-22 Andrew Pinski * gnu/gcj/runtime/NameFinder.java (close): IN, OUT, and PROC can all be null, check for that case and don't deference it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98573 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/gnu/gcj/runtime/NameFinder.java | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b85cdf23eaa..1a9c0ba31bc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-04-22 Andrew Pinski + + * 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 * java/util/logging/LogManager.java: Reformatted. diff --git a/libjava/gnu/gcj/runtime/NameFinder.java b/libjava/gnu/gcj/runtime/NameFinder.java index 5469f08168d..4c629bb22ec 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(); } } -- 2.11.0