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/tools/StopWindowsService.java | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/StopWindowsService.java b/opends/src/server/org/opends/server/tools/StopWindowsService.java
index 594e544..3582e58 100644
--- a/opends/src/server/org/opends/server/tools/StopWindowsService.java
+++ b/opends/src/server/org/opends/server/tools/StopWindowsService.java
@@ -84,25 +84,8 @@
OutputStream errStream)
{
int returnValue;
- PrintStream out;
- if (outStream == null)
- {
- out = NullOutputStream.printStream();
- }
- else
- {
- out = new PrintStream(outStream);
- }
-
- PrintStream err;
- if (errStream == null)
- {
- err = NullOutputStream.printStream();
- }
- else
- {
- err = new PrintStream(errStream);
- }
+ PrintStream out = NullOutputStream.wrapOrNullStream(outStream);
+ PrintStream err = NullOutputStream.wrapOrNullStream(errStream);
String serviceName = ConfigureWindowsService.getServiceName();
if (serviceName == null)
--
Gitblit v1.10.0