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/AsynchronousTextWriter.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/opends/src/server/org/opends/server/loggers/AsyncronousTextWriter.java b/opends/src/server/org/opends/server/loggers/AsynchronousTextWriter.java
similarity index 95%
rename from opends/src/server/org/opends/server/loggers/AsyncronousTextWriter.java
rename to opends/src/server/org/opends/server/loggers/AsynchronousTextWriter.java
index 57a8951..baacd4e 100644
--- a/opends/src/server/org/opends/server/loggers/AsyncronousTextWriter.java
+++ b/opends/src/server/org/opends/server/loggers/AsynchronousTextWriter.java
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2013 ForgeRock AS.
  */
 package org.opends.server.loggers;
 
@@ -44,7 +45,7 @@
  * A Text Writer which writes log records asynchronously to
  * character-based stream.
  */
-public class AsyncronousTextWriter
+public class AsynchronousTextWriter
     implements ServerShutdownListener, TextWriter
 {
   /**
@@ -65,7 +66,7 @@
   private boolean autoFlush;
 
   /**
-   * Construct a new AsyncronousTextWriter wrapper.
+   * Construct a new AsynchronousTextWriter wrapper.
    *
    * @param name      the name of the thread.
    * @param capacity      the size of the queue before it gets flushed.
@@ -73,7 +74,7 @@
    *                  after the queue is flushed.
    * @param writer    a character stream used for output.
    */
-  public AsyncronousTextWriter(String name, int capacity, boolean autoFlush,
+  public AsynchronousTextWriter(String name, int capacity, boolean autoFlush,
                                TextWriter writer)
   {
     this.name = name;
@@ -199,7 +200,7 @@
   /**
    * Retrieves the wrapped writer.
    *
-   * @return The wrapped writer used by this asyncronous writer.
+   * @return The wrapped writer used by this asynchronous writer.
    */
   public TextWriter getWrappedWriter()
   {
@@ -211,7 +212,7 @@
    */
   public String getShutdownListenerName()
   {
-    return "AsyncronousTextWriter Thread " + name;
+    return "AsynchronousTextWriter Thread " + name;
   }
 
   /**

--
Gitblit v1.10.0