From 750f4ef44dea9b12c41fedc326a6cf6e71bb56a4 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 15 Jul 2013 08:40:31 +0000
Subject: [PATCH] Created NullOutputStream.wrapOrNullStream() and used it in all tools instead of duplicating the null checks everywhere.
---
opends/src/server/org/opends/server/util/cli/ConsoleApplication.java | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java b/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
index bc72e64..f475576 100644
--- a/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
+++ b/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
@@ -176,23 +176,8 @@
this.in = new BufferedReader(new NullReader());
}
- if (out != null)
- {
- this.out = out;
- }
- else
- {
- this.out = NullOutputStream.printStream();
- }
-
- if (err != null)
- {
- this.err = out;
- }
- else
- {
- this.err = NullOutputStream.printStream();
- }
+ this.out = NullOutputStream.wrapOrNullStream(out);
+ this.err = NullOutputStream.wrapOrNullStream(err);
}
/**
@@ -217,23 +202,8 @@
this.in = new BufferedReader(new NullReader());
}
- if (out != null)
- {
- this.out = new PrintStream(out);
- }
- else
- {
- this.out = NullOutputStream.printStream();
- }
-
- if (err != null)
- {
- this.err = new PrintStream(err);
- }
- else
- {
- this.err = NullOutputStream.printStream();
- }
+ this.out = NullOutputStream.wrapOrNullStream(out);
+ this.err = NullOutputStream.wrapOrNullStream(err);
}
/**
--
Gitblit v1.10.0