From 01060d852ec2c7adac50cd3ecd655de79655b509 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 27 Nov 2012 06:39:49 -0500 Subject: [PATCH] Bug 394766: MIInferiorProcess leaks 2x LargePipedInputStreams after a restart, added guards to avoid NPEs. --- .../cdt/dsf/mi/service/command/MIInferiorProcess.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java index 64ca133ed7c..ad8319ada7c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java @@ -328,12 +328,12 @@ public class MIInferiorProcess extends Process private void closeIO() { try { - fOutputStream.close(); + if (fOutputStream != null) fOutputStream.close(); // Make sure things get GCed fOutputStream = null; } catch (IOException e) {} try { - fInputStream.close(); + if (fInputStream != null) fInputStream.close(); // Make sure things get GCed fInputStream = null; } catch (IOException e) {} @@ -343,12 +343,12 @@ public class MIInferiorProcess extends Process fInputStreamPiped = null; } catch (IOException e) {} try { - fErrorStream.close(); + if (fErrorStream != null) fErrorStream.close(); // Make sure things get GCed fErrorStream = null; } catch (IOException e) {} try { - fErrorStreamPiped.close(); + if (fErrorStreamPiped != null) fErrorStreamPiped.close(); // Make sure things get GCed fErrorStreamPiped = null; } catch (IOException e) {}