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/TextHTTPAccessLogPublisher.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java b/opends/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
index efc7b3f..3bbb9e2 100644
--- a/opends/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
+++ b/opends/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
@@ -110,9 +110,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)
{
@@ -148,11 +148,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);
}
@@ -165,13 +166,14 @@
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);
+ final AsynchronousTextWriter asyncWriter =
+ new AsynchronousTextWriter("Asynchronous Text Writer for "
+ + config.dn().toNormalizedString(), config.getQueueSize(),
+ config.isAutoFlush(), mfWriter);
writer = asyncWriter;
}
@@ -252,8 +254,8 @@
{
if (cfg.getQueueSize() > 0)
{
- this.writer = new AsyncronousTextWriter(
- "Asyncronous Text Writer for " + cfg.dn().toNormalizedString(),
+ this.writer = new AsynchronousTextWriter(
+ "Asynchronous Text Writer for " + cfg.dn().toNormalizedString(),
cfg.getQueueSize(), cfg.isAutoFlush(), theWriter);
}
else
--
Gitblit v1.10.0