From 00d37e85955e374be365f1c34de5af1f69a6476c 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 .
---
opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index d514328..2ae8ddd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -153,9 +153,9 @@
TextWriter currentWriter;
// Determine the writer we are using. If we were writing
// asynchronously, we need to modify the underlying writer.
- if (writer instanceof AsyncronousTextWriter)
+ if (writer instanceof AsynchronousTextWriter)
{
- currentWriter = ((AsyncronousTextWriter) writer).getWrappedWriter();
+ currentWriter = ((AsynchronousTextWriter) writer).getWrappedWriter();
}
else if (writer instanceof ParallelTextWriter)
{
@@ -191,11 +191,12 @@
mfWriter.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
}
- if (writer instanceof AsyncronousTextWriter && !config.isAsynchronous())
+ if (writer instanceof AsynchronousTextWriter
+ && !config.isAsynchronous())
{
// The asynchronous setting is being turned off.
- final AsyncronousTextWriter asyncWriter =
- ((AsyncronousTextWriter) writer);
+ final AsynchronousTextWriter asyncWriter =
+ ((AsynchronousTextWriter) writer);
writer = mfWriter;
asyncWriter.shutdown(false);
}
@@ -208,23 +209,21 @@
asyncWriter.shutdown(false);
}
- if (!(writer instanceof AsyncronousTextWriter)
+ if (!(writer instanceof AsynchronousTextWriter)
&& config.isAsynchronous())
{
// The asynchronous setting is being turned on.
- final AsyncronousTextWriter asyncWriter = new AsyncronousTextWriter(
- "Asyncronous Text Writer for " + config.dn().toNormalizedString(),
- config.getQueueSize(), config.isAutoFlush(), mfWriter);
- writer = asyncWriter;
+ writer = new AsynchronousTextWriter(
+ "Asyncronous Text Writer for " + config.dn().toNormalizedString(),
+ config.getQueueSize(), config.isAutoFlush(), mfWriter);
}
if (!(writer instanceof ParallelTextWriter) && config.isAsynchronous())
{
// The asynchronous setting is being turned on.
- final ParallelTextWriter asyncWriter = new ParallelTextWriter(
+ writer = new ParallelTextWriter(
"Parallel Text Writer for " + config.dn().toNormalizedString(),
config.isAutoFlush(), mfWriter);
- writer = asyncWriter;
}
if ((cfg.isAsynchronous() && config.isAsynchronous())
@@ -299,7 +298,7 @@
{
if (cfg.getQueueSize() > 0)
{
- this.writer = new AsyncronousTextWriter(
+ this.writer = new AsynchronousTextWriter(
"Asyncronous Text Writer for " + cfg.dn().toNormalizedString(),
cfg.getQueueSize(), cfg.isAutoFlush(), theWriter);
}
--
Gitblit v1.10.0