From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java b/opends/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java
index 5e4b7f1..5b5dd09 100644
--- a/opends/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java
+++ b/opends/src/server/org/opends/server/loggers/debug/TextDebugLogPublisher.java
@@ -175,9 +175,9 @@
if(config.isAsynchronous())
{
- this.writer = new AsyncronousTextWriter("Asyncronous Text Writer for " +
- config.dn().toNormalizedString(), config.getQueueSize(),
- config.isAutoFlush(), writer);
+ this.writer = new AsynchronousTextWriter(
+ "Asynchronous Text Writer for " + config.dn().toNormalizedString(),
+ config.getQueueSize(), config.isAutoFlush(), writer);
}
else
{
@@ -324,9 +324,9 @@
TextWriter currentWriter;
// Determine the writer we are using. If we were writing asyncronously,
// we need to modify the underlaying writer.
- if(writer instanceof AsyncronousTextWriter)
+ if(writer instanceof AsynchronousTextWriter)
{
- currentWriter = ((AsyncronousTextWriter)writer).getWrappedWriter();
+ currentWriter = ((AsynchronousTextWriter)writer).getWrappedWriter();
}
else
{
@@ -357,24 +357,23 @@
mfWriter.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
}
- if(writer instanceof AsyncronousTextWriter && !config.isAsynchronous())
+ if(writer instanceof AsynchronousTextWriter && !config.isAsynchronous())
{
- // The asynronous setting is being turned off.
- AsyncronousTextWriter asyncWriter = ((AsyncronousTextWriter)writer);
+ // The asynchronous setting is being turned off.
+ AsynchronousTextWriter asyncWriter =
+ ((AsynchronousTextWriter)writer);
writer = mfWriter;
asyncWriter.shutdown(false);
}
- if(!(writer instanceof AsyncronousTextWriter) &&
+ if(!(writer instanceof AsynchronousTextWriter) &&
config.isAsynchronous())
{
- // The asynronous setting is being turned on.
- AsyncronousTextWriter asyncWriter =
- new AsyncronousTextWriter("Asyncronous Text Writer for " +
- config.dn().toNormalizedString(), config.getQueueSize(),
- config.isAutoFlush(),
- mfWriter);
- writer = asyncWriter;
+ // The asynchronous setting is being turned on.
+ writer = new AsynchronousTextWriter("Asynchronous Text Writer for " +
+ config.dn().toNormalizedString(), config.getQueueSize(),
+ config.isAutoFlush(),
+ mfWriter);
}
if((currentConfig.isAsynchronous() && config.isAsynchronous()) &&
--
Gitblit v1.10.0