From fcfeaa126e75c11cfb963f02c6f66a53bbca3109 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 26 Nov 2015 16:46:33 +0000
Subject: [PATCH] OPENDJ-2465 Add support for transactionId in current DJ access and HTTP access loggers

---
 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/LdapHttpApplication.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/LdapHttpApplication.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/LdapHttpApplication.java
index 0dd19b6..f80fa63 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/LdapHttpApplication.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/LdapHttpApplication.java
@@ -34,7 +34,6 @@
 import org.forgerock.http.Handler;
 import org.forgerock.http.HttpApplication;
 import org.forgerock.http.HttpApplicationException;
-import org.forgerock.http.filter.TransactionIdInboundFilter;
 import org.forgerock.http.handler.Handlers;
 import org.forgerock.http.io.Buffer;
 import org.forgerock.http.protocol.Request;
@@ -136,11 +135,12 @@
       final Object jsonElems = Json.readJsonLenient(new FileReader(configFile));
       final JsonValue configuration = new JsonValue(jsonElems).recordKeyAccesses();
       handler = new LdapHttpHandler(configuration);
-      filter = new CollectClientConnectionsFilter(connectionHandler, getAuthenticationConfig(configuration));
+      filter =
+          new CollectClientConnectionsFilter(serverContext, connectionHandler, getAuthenticationConfig(configuration));
       configuration.verifyAllKeysAccessed();
 
-      TransactionIdInboundFilter transactionIdFilter = new TransactionIdInboundFilter();
       RequestHandler requestHandler = serverContext.getCommonAudit().getAuditServiceForHttpAccessLog();
+      CommonAuditTransactionIdFilter transactionIdFilter = new CommonAuditTransactionIdFilter(serverContext);
       CommonAuditHttpAccessAuditFilter httpAccessFilter =
           new CommonAuditHttpAccessAuditFilter(DynamicConstants.PRODUCT_NAME, requestHandler, TimeService.SYSTEM);
       CommonAuditHttpAccessCheckEnabledFilter checkFilter =

--
Gitblit v1.10.0