From 1424fbc56193f3e821d96e2b7f3a97f2bfd7f56c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 07 Nov 2013 14:20:09 +0000
Subject: [PATCH] Replication messages clean up.
---
opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java | 12 +++---------
opends/src/messages/messages/replication_es.properties | 4 ++--
opends/src/messages/messages/replication_zh_CN.properties | 4 ++--
opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java | 7 ++-----
opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java | 7 ++-----
opends/src/messages/messages/replication_ja.properties | 4 ++--
opends/src/messages/messages/replication.properties | 4 ++--
opends/src/messages/messages/replication_fr.properties | 4 ++--
opends/src/messages/messages/replication_de.properties | 4 ++--
opends/src/messages/messages/replication_ko.properties | 4 ++--
opends/src/messages/messages/replication_zh_TW.properties | 4 ++--
11 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/opends/src/messages/messages/replication.properties b/opends/src/messages/messages/replication.properties
index 531b0b7..7d8a3c1 100644
--- a/opends/src/messages/messages/replication.properties
+++ b/opends/src/messages/messages/replication.properties
@@ -75,13 +75,13 @@
MILD_ERR_CANNOT_RECOVER_CHANGES_21=Error when searching old changes from the \
database for base DN %s
NOTICE_EXCEPTION_CLOSING_DATABASE_24=Error closing Replication Server database \
- %s :
+ %s : %s
SEVERE_ERR_EXCEPTION_DECODING_OPERATION_25=Error trying to replay %s, \
operation could not be decoded :
FATAL_ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR_26=Error Trying to use the \
underlying database. The Replication Server is going to shut down
SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=Error closing the Replication Server \
- database :
+ database : %s
SEVERE_ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH_29=Error during the Replication \
Server database trimming or flush process. The Changelog service is going to \
shutdown
diff --git a/opends/src/messages/messages/replication_de.properties b/opends/src/messages/messages/replication_de.properties
index 8c2200e..d4df7be 100644
--- a/opends/src/messages/messages/replication_de.properties
+++ b/opends/src/messages/messages/replication_de.properties
@@ -65,10 +65,10 @@
NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=Es sollten mehrere Replikationsserver konfiguriert sein
SEVERE_ERR_EXCEPTION_SENDING_TOPO_INFO_20=E/A-Ausnahme beim Senden der Topologieinformationen (zum Aktualisieren) auf Dom\u00e4ne %s f\u00fcr %s Server %s aufgefangen: %s
MILD_ERR_CANNOT_RECOVER_CHANGES_21=Fehler bei der Durchsuchung von alten \u00c4nderungen aus der Datenbank f\u00fcr Basis-DN %s
-NOTICE_EXCEPTION_CLOSING_DATABASE_24=Fehler beim Schlie\u00dfen der Replikationsserverdatenbank %s:
+NOTICE_EXCEPTION_CLOSING_DATABASE_24=Fehler beim Schlie\u00dfen der Replikationsserverdatenbank %s: %s
SEVERE_ERR_EXCEPTION_DECODING_OPERATION_25=Fehler beim Versuch, %s wiederzugeben, Vorgang konnten nicht entschl\u00fcsselt werden :
FATAL_ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR_26=Fehler beim Versuch, die zugrunde liegende Datenbank zu verwenden : Der Replikationsserver wird heruntergefahren
-SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=Fehler beim Schlie\u00dfen der Replikationsserver-Datenbank :
+SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=Fehler beim Schlie\u00dfen der Replikationsserver-Datenbank : %s
SEVERE_ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH_29=Fehler w\u00e4hrend des Trimming- und Leerungsprozesses der Replikationsserver-Datenbank. Der \u00c4nderungsprotokollservice wird beendet
SEVERE_ERR_WRITER_UNEXPECTED_EXCEPTION_32=Bei der Behandlung der Verbindung mit %s ist ein unerwarteter Fehler aufgetreten. Diese Verbindung wird geschlossen
SEVERE_ERR_RS_ERROR_SENDING_ACK_33=In Replikationsserver %s: ist ein unerwarteter Fehler aufgetreten, w\u00e4hrend ein Ack an Server-ID %s zum \u00c4ndern der Nummer %s in Dom\u00e4ne %s gesendet wurde. Diese Verbindung wird geschlossen und erneut ge\u00f6ffnet
diff --git a/opends/src/messages/messages/replication_es.properties b/opends/src/messages/messages/replication_es.properties
index ce2b9c3..8d58b53 100644
--- a/opends/src/messages/messages/replication_es.properties
+++ b/opends/src/messages/messages/replication_es.properties
@@ -65,10 +65,10 @@
NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=Se debe configurar m\u00e1s de un servidor de repetici\u00f3n
SEVERE_ERR_EXCEPTION_SENDING_TOPO_INFO_20=Se ha detectado la excepci\u00f3n IOException al enviar informaci\u00f3n de topolog\u00eda (para la actualizaci\u00f3n) en el dominio %1$s para el servidor %3$s de %2$s: %4$s
MILD_ERR_CANNOT_RECOVER_CHANGES_21=Error al buscar cambios antiguos en la base de datos para el ND de base %s
-NOTICE_EXCEPTION_CLOSING_DATABASE_24=Error al cerrar la base de datos %s de Replication Server:
+NOTICE_EXCEPTION_CLOSING_DATABASE_24=Error al cerrar la base de datos %s de Replication Server: %s
SEVERE_ERR_EXCEPTION_DECODING_OPERATION_25=Error al tratar de reproducir %s, no pudo descodificarse la operaci\u00f3n:
FATAL_ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR_26=Error al tratar de usar la base de datos subyacente. El Servidor de repetici\u00f3n se cerrar\u00e1
-SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=Error al cerrar la base de datos del Servidor de repetici\u00f3n:
+SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=Error al cerrar la base de datos del Servidor de repetici\u00f3n: %s
SEVERE_ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH_29=Error durante el proceso de recorte o vaciado de la base de datos del Servidor de repetici\u00f3n. El servicio de registro de cambios se cerrar\u00e1
SEVERE_ERR_WRITER_UNEXPECTED_EXCEPTION_32=Se ha producido un error inesperado al controlar la conexi\u00f3n con %s. Esta conexi\u00f3n se cerrar\u00e1
SEVERE_ERR_RS_ERROR_SENDING_ACK_33=En el servidor de repetici\u00f3n %s: se ha producido un error al enviar una confirmaci\u00f3n (ACK) al Id. de servidor %s para el n\u00famero de cambio %s en el dominio %s. Esta conexi\u00f3n se cerrar\u00e1 y se volver\u00e1 a abrir
diff --git a/opends/src/messages/messages/replication_fr.properties b/opends/src/messages/messages/replication_fr.properties
index e7c9a93..09fa8b8 100644
--- a/opends/src/messages/messages/replication_fr.properties
+++ b/opends/src/messages/messages/replication_fr.properties
@@ -65,10 +65,10 @@
NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=Plus d'un serveur de r\u00e9plication doit \u00eatre configur\u00e9
SEVERE_ERR_EXCEPTION_SENDING_TOPO_INFO_20=Exception IOException d\u00e9tect\u00e9e lors de l'envoi des informations de topologie (pour mise \u00e0 jour) du domaine %s pour le serveur %s %s\u00a0: %s
MILD_ERR_CANNOT_RECOVER_CHANGES_21=Erreur lors de la recherche d'anciennes modifications \u00e0 partir de base de donn\u00e9es pour le DN de base %s
-NOTICE_EXCEPTION_CLOSING_DATABASE_24=Erreur lors de la fermeture de la base de donn\u00e9es du serveur de r\u00e9plication %s :
+NOTICE_EXCEPTION_CLOSING_DATABASE_24=Erreur lors de la fermeture de la base de donn\u00e9es du serveur de r\u00e9plication %s : %s
SEVERE_ERR_EXCEPTION_DECODING_OPERATION_25=Erreur lors de la tentative de r\u00e9ex\u00e9cution de %s, impossible de d\u00e9coder l'op\u00e9ration\u00a0:
FATAL_ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR_26=Erreur lors de la tentative d'utilisation de la base de donn\u00e9es sous-jacente. Le serveur de r\u00e9plication va s'arr\u00eater
-SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=Erreur lors de la fermeture de la base de donn\u00e9es du serveur de r\u00e9plication\u00a0:
+SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=Erreur lors de la fermeture de la base de donn\u00e9es du serveur de r\u00e9plication\u00a0: %s
SEVERE_ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH_29=Erreur lors du processus de troncation ou d'effacement de la base de donn\u00e9es du serveur de r\u00e9plication. Le service de journal des modifications va s'arr\u00eater
SEVERE_ERR_WRITER_UNEXPECTED_EXCEPTION_32=Une erreur inattendue s'est produite lors de la gestion de la connexion avec %s. Cette connexion va \u00eatre ferm\u00e9e
SEVERE_ERR_RS_ERROR_SENDING_ACK_33=Sur le serveur de r\u00e9plication %s\u00a0: une erreur inattendue s'est produite lors de l'envoi de la commande ACK au serveur portant l'ID %s pour le num\u00e9ro de modification %s du domaine %s. Cette connexion va \u00eatre ferm\u00e9e, puis rouverte
diff --git a/opends/src/messages/messages/replication_ja.properties b/opends/src/messages/messages/replication_ja.properties
index b099f6d..59b205a 100644
--- a/opends/src/messages/messages/replication_ja.properties
+++ b/opends/src/messages/messages/replication_ja.properties
@@ -65,10 +65,10 @@
NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=\u8907\u6570\u306e\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u3092\u69cb\u6210\u3057\u3066\u304f\u3060\u3055\u3044
SEVERE_ERR_EXCEPTION_SENDING_TOPO_INFO_20=%2$s \u30b5\u30fc\u30d0\u30fc %3$s \u306e\u30c9\u30e1\u30a4\u30f3 %1$s \u3067\u30c8\u30dd\u30ed\u30b8\u60c5\u5831 (\u66f4\u65b0\u7528) \u3092\u9001\u4fe1\u4e2d\u306b IOException \u304c\u30ad\u30e3\u30c3\u30c1\u3055\u308c\u307e\u3057\u305f: %4$s
MILD_ERR_CANNOT_RECOVER_CHANGES_21=\u30d9\u30fc\u30b9 DN %s \u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304b\u3089\u4ee5\u524d\u306e\u5909\u66f4\u3092\u691c\u7d22\u4e2d\u306b\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-NOTICE_EXCEPTION_CLOSING_DATABASE_24=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 %s \u3092\u9589\u3058\u3066\u3044\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:
+NOTICE_EXCEPTION_CLOSING_DATABASE_24=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 %s \u3092\u9589\u3058\u3066\u3044\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
SEVERE_ERR_EXCEPTION_DECODING_OPERATION_25=%s \u306e\u518d\u5b9f\u884c\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u64cd\u4f5c\u3092\u30c7\u30b3\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f:
FATAL_ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR_26=\u914d\u4e0b\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u4f7f\u7528\u3059\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u306f\u505c\u6b62\u3057\u307e\u3059
-SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u9589\u3058\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:
+SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u9589\u3058\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
SEVERE_ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH_29=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u8abf\u6574\u307e\u305f\u306f\u30d5\u30e9\u30c3\u30b7\u30e5\u51e6\u7406\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u66f4\u65b0\u5c65\u6b74\u30ed\u30b0\u30b5\u30fc\u30d3\u30b9\u306f\u505c\u6b62\u3057\u307e\u3059
SEVERE_ERR_WRITER_UNEXPECTED_EXCEPTION_32=%s \u3068\u306e\u63a5\u7d9a\u3092\u51e6\u7406\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u3053\u306e\u63a5\u7d9a\u306f\u9589\u3058\u3089\u308c\u307e\u3059
SEVERE_ERR_RS_ERROR_SENDING_ACK_33=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc %1$s: \u30c9\u30e1\u30a4\u30f3 %4$s \u3067\u5909\u66f4\u756a\u53f7 %3$s \u306b\u3064\u3044\u3066\u30b5\u30fc\u30d0\u30fc ID %2$s \u306b\u53d7\u4fe1\u78ba\u8a8d\u3092\u9001\u4fe1\u4e2d\u306b\u3001\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u3053\u306e\u63a5\u7d9a\u306f\u9589\u3058\u3089\u308c\u305f\u3042\u3068\u3001\u958b\u304d\u76f4\u3055\u308c\u307e\u3059
diff --git a/opends/src/messages/messages/replication_ko.properties b/opends/src/messages/messages/replication_ko.properties
index 59ecb8e..6d86048 100644
--- a/opends/src/messages/messages/replication_ko.properties
+++ b/opends/src/messages/messages/replication_ko.properties
@@ -64,10 +64,10 @@
MILD_ERR_ERROR_SEARCHING_RUV_15=\uc11c\ubc84 \uc11c\ubc84 \uc0c1\ud0dc %2$s\uc744(\ub97c) \uac80\uc0c9\ud558\ub294 \ub3d9\uc548 %1$s \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %3s \uae30\ubcf8 dn : %4$s
NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=\ub458 \uc774\uc0c1\uc758 \ubcf5\uc81c \uc11c\ubc84\ub97c \uad6c\uc131\ud574\uc57c \ud569\ub2c8\ub2e4.
MILD_ERR_CANNOT_RECOVER_CHANGES_21=\ub370\uc774\ud130\ubca0\uc774\uc2a4\uc5d0\uc11c \uae30\ubcf8 DN %s\uc5d0 \ub300\ud55c \uc774\uc804 \ubcc0\uacbd \uc0ac\ud56d\uc744 \uac80\uc0c9\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.
-NOTICE_EXCEPTION_CLOSING_DATABASE_24=\ubcf5\uc81c \uc11c\ubc84 \ub370\uc774\ud130\ubca0\uc774\uc2a4 %s\uc744(\ub97c) \ub2eb\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4:
+NOTICE_EXCEPTION_CLOSING_DATABASE_24=\ubcf5\uc81c \uc11c\ubc84 \ub370\uc774\ud130\ubca0\uc774\uc2a4 %s\uc744(\ub97c) \ub2eb\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
SEVERE_ERR_EXCEPTION_DECODING_OPERATION_25=%s\uc744(\ub97c) \uc7ac\uc0dd\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \uc791\uc5c5\uc744 \ud574\ub3c5\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4:
FATAL_ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR_26=\uae30\ubcf8 \ub370\uc774\ud130\ubca0\uc774\uc2a4\ub97c \uc0ac\uc6a9\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \ubcf5\uc81c \uc11c\ubc84\uac00 \uc885\ub8cc\ub429\ub2c8\ub2e4.
-SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=\ubcf5\uc81c \uc11c\ubc84 \ub370\uc774\ud130\ubca0\uc774\uc2a4\ub97c \ub2eb\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4:
+SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=\ubcf5\uc81c \uc11c\ubc84 \ub370\uc774\ud130\ubca0\uc774\uc2a4\ub97c \ub2eb\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
SEVERE_ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH_29=\ubcf5\uc81c \uc11c\ubc84 \ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc9c0\uc6b0\uae30 \ub610\ub294 \ud50c\ub7ec\uc2dc \ud504\ub85c\uc138\uc2a4 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \ubcc0\uacbd \ub85c\uadf8 \uc11c\ube44\uc2a4\uac00 \uc885\ub8cc\ub429\ub2c8\ub2e4.
SEVERE_ERR_WRITER_UNEXPECTED_EXCEPTION_32=%s\uacfc(\uc640)\uc758 \uc5f0\uacb0\uc744 \ucc98\ub9ac\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \uc774 \uc5f0\uacb0\uc774 \uc885\ub8cc\ub429\ub2c8\ub2e4.
SEVERE_ERR_EXCEPTION_RECEIVING_REPLICATION_MESSAGE_34=\ubcf5\uc81c \uba54\uc2dc\uc9c0\ub97c \uc218\uc2e0\ud558\ub294 \ub3d9\uc548 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
diff --git a/opends/src/messages/messages/replication_zh_CN.properties b/opends/src/messages/messages/replication_zh_CN.properties
index 90566ec..174b4af 100644
--- a/opends/src/messages/messages/replication_zh_CN.properties
+++ b/opends/src/messages/messages/replication_zh_CN.properties
@@ -65,10 +65,10 @@
NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=\u5e94\u914d\u7f6e\u591a\u4e2a\u590d\u5236\u670d\u52a1\u5668
SEVERE_ERR_EXCEPTION_SENDING_TOPO_INFO_20=\u5728\u57df %s \u4e0a\u4e3a %s \u670d\u52a1\u5668 %s \u53d1\u9001\u62d3\u6251\u4fe1\u606f\uff08\u7528\u4e8e\u66f4\u65b0\uff09\u65f6\u6355\u83b7\u5230 IOException: %s
MILD_ERR_CANNOT_RECOVER_CHANGES_21=\u5728\u4e3a\u57fa DN %s \u641c\u7d22\u6570\u636e\u5e93\u4e2d\u7684\u65e7\u66f4\u6539\u65f6\u51fa\u73b0\u9519\u8bef
-NOTICE_EXCEPTION_CLOSING_DATABASE_24=\u5728\u5173\u95ed\u590d\u5236\u670d\u52a1\u5668\u6570\u636e\u5e93 %s \u65f6\u51fa\u73b0\u9519\u8bef:
+NOTICE_EXCEPTION_CLOSING_DATABASE_24=\u5728\u5173\u95ed\u590d\u5236\u670d\u52a1\u5668\u6570\u636e\u5e93 %s \u65f6\u51fa\u73b0\u9519\u8bef: %s
SEVERE_ERR_EXCEPTION_DECODING_OPERATION_25=\u5c1d\u8bd5\u91cd\u653e %s \u65f6\u51fa\u73b0\u9519\u8bef\uff0c\u65e0\u6cd5\u5bf9\u64cd\u4f5c\u8fdb\u884c\u89e3\u7801:
FATAL_ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR_26=\u5c1d\u8bd5\u4f7f\u7528\u57fa\u7840\u6570\u636e\u5e93\u65f6\u51fa\u73b0\u9519\u8bef\u3002\u590d\u5236\u670d\u52a1\u5668\u5c06\u88ab\u5173\u95ed
-SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=\u5173\u95ed\u590d\u5236\u670d\u52a1\u5668\u6570\u636e\u5e93\u65f6\u51fa\u73b0\u9519\u8bef:
+SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=\u5173\u95ed\u590d\u5236\u670d\u52a1\u5668\u6570\u636e\u5e93\u65f6\u51fa\u73b0\u9519\u8bef: %s
SEVERE_ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH_29=\u590d\u5236\u670d\u52a1\u5668\u6570\u636e\u5e93\u4fee\u6574\u6216\u5237\u65b0\u8fdb\u7a0b\u8fc7\u7a0b\u4e2d\u51fa\u73b0\u9519\u8bef\u3002\u66f4\u6539\u65e5\u5fd7\u670d\u52a1\u5c06\u88ab\u5173\u95ed
SEVERE_ERR_WRITER_UNEXPECTED_EXCEPTION_32=\u5904\u7406\u4e0e %s \u7684\u8fde\u63a5\u65f6\u53d1\u751f\u610f\u5916\u9519\u8bef\u3002\u6b64\u8fde\u63a5\u5c06\u88ab\u5173\u95ed
SEVERE_ERR_RS_ERROR_SENDING_ACK_33=\u5728\u590d\u5236\u670d\u52a1\u5668 %1$s \u4e2d\uff1a\u5728\u57df %4$s \u4e2d\uff0c\u5411\u670d\u52a1\u5668 ID %2$s \u53d1\u9001\u786e\u8ba4\u4ee5\u83b7\u53d6\u66f4\u6539\u7f16\u53f7 %3$s \u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef\u3002\u6b64\u8fde\u63a5\u5c06\u88ab\u5173\u95ed\u5e76\u91cd\u65b0\u6253\u5f00
diff --git a/opends/src/messages/messages/replication_zh_TW.properties b/opends/src/messages/messages/replication_zh_TW.properties
index 1d94974..91fb33e 100644
--- a/opends/src/messages/messages/replication_zh_TW.properties
+++ b/opends/src/messages/messages/replication_zh_TW.properties
@@ -64,10 +64,10 @@
MILD_ERR_ERROR_SEARCHING_RUV_15=\u641c\u5c0b\u4f3a\u670d\u5668\u72c0\u614b %2$s \u6642\u767c\u751f\u932f\u8aa4 %1$s: %3$s\uff0c\u57fa\u5e95 dn: %4$s
NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=\u61c9\u914d\u7f6e\u591a\u90e8\u8907\u88fd\u4f3a\u670d\u5668
MILD_ERR_CANNOT_RECOVER_CHANGES_21=\u5f9e\u8cc7\u6599\u5eab\u4e2d\u641c\u5c0b\u57fa\u5e95 DN %s \u7684\u820a\u6709\u8b8a\u66f4\u6642\u767c\u751f\u932f\u8aa4
-NOTICE_EXCEPTION_CLOSING_DATABASE_24=\u95dc\u9589\u8907\u88fd\u4f3a\u670d\u5668\u8cc7\u6599\u5eab %s \u6642\u767c\u751f\u932f\u8aa4:
+NOTICE_EXCEPTION_CLOSING_DATABASE_24=\u95dc\u9589\u8907\u88fd\u4f3a\u670d\u5668\u8cc7\u6599\u5eab %s \u6642\u767c\u751f\u932f\u8aa4: %s
SEVERE_ERR_EXCEPTION_DECODING_OPERATION_25=\u5617\u8a66\u91cd\u65b0\u57f7\u884c %s \u6642\u767c\u751f\u932f\u8aa4\uff0c\u4f5c\u696d\u7121\u6cd5\u89e3\u78bc:
FATAL_ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR_26=\u5617\u8a66\u4f7f\u7528\u57fa\u790e\u8cc7\u6599\u5eab\u6642\u767c\u751f\u932f\u8aa4\u3002\u8907\u88fd\u4f3a\u670d\u5668\u5373\u5c07\u95dc\u9589
-SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=\u95dc\u9589\u8907\u88fd\u4f3a\u670d\u5668\u8cc7\u6599\u5eab\u6642\u767c\u751f\u932f\u8aa4:
+SEVERE_ERR_ERROR_CLOSING_CHANGELOG_ENV_28=\u95dc\u9589\u8907\u88fd\u4f3a\u670d\u5668\u8cc7\u6599\u5eab\u6642\u767c\u751f\u932f\u8aa4: %s
SEVERE_ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH_29=\u5728\u8907\u88fd\u4f3a\u670d\u5668\u8cc7\u6599\u5eab\u522a\u6e1b\u6216\u6e05\u9664\u8655\u7406\u7a0b\u5e8f\u671f\u9593\u767c\u751f\u932f\u8aa4\u3002\u8b8a\u66f4\u8a18\u9304\u670d\u52d9\u5373\u5c07\u95dc\u9589
SEVERE_ERR_WRITER_UNEXPECTED_EXCEPTION_32=\u8655\u7406 %s \u7684\u9023\u7dda\u6642\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4\u3002\u6b64\u9023\u7dda\u5373\u5c07\u95dc\u9589
SEVERE_ERR_EXCEPTION_RECEIVING_REPLICATION_MESSAGE_34=\u63a5\u6536\u8907\u88fd\u8a0a\u606f\u6642\u767c\u751f\u7570\u5e38: %s
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
index 0de4f51..f01d994 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java
@@ -161,11 +161,8 @@
}
catch (DatabaseException e)
{
- MessageBuilder mb = new MessageBuilder();
- mb.append(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString()));
- mb.append(" ");
- mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
+ logError(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
+ stackTraceToSingleLineString(e)));
}
finally
{
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
index 7dbf816..2a569ad 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
@@ -269,11 +269,8 @@
}
catch (DatabaseException e)
{
- MessageBuilder mb = new MessageBuilder();
- mb.append(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString()));
- mb.append(" ");
- mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
+ logError(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
+ stackTraceToSingleLineString(e)));
}
finally
{
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
index 48c299e..cdfbcae 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
@@ -458,18 +458,12 @@
private Message newErrorMessage(String dbName, DatabaseException e)
{
- final MessageBuilder mb = new MessageBuilder();
if (dbName != null)
{
- mb.append(NOTE_EXCEPTION_CLOSING_DATABASE.get(dbName));
+ return NOTE_EXCEPTION_CLOSING_DATABASE.get(dbName,
+ stackTraceToSingleLineString(e));
}
- else
- {
- mb.append(ERR_ERROR_CLOSING_CHANGELOG_ENV.get());
- }
- mb.append(" ");
- mb.append(stackTraceToSingleLineString(e));
- return mb.toMessage();
+ return ERR_ERROR_CLOSING_CHANGELOG_ENV.get(stackTraceToSingleLineString(e));
}
/**
--
Gitblit v1.10.0