From 7862299ac0d40222682007bd8d9400b3352d6da6 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 08 Jun 2011 20:52:51 +0000
Subject: [PATCH] Fix OPENDJ-61: Log LDAP protocol version in bind request logging

---
 opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index ffc0c29..6d75514 100644
--- a/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -631,6 +631,13 @@
     StringBuilder buffer = new StringBuilder(100);
     appendHeader(bindOperation, "BIND", CATEGORY_REQUEST, buffer);
 
+    final String protocolVersion = bindOperation.getProtocolVersion();
+    if (protocolVersion != null)
+    {
+      buffer.append(" version=");
+      buffer.append(protocolVersion);
+    }
+
     switch (bindOperation.getAuthenticationType())
     {
     case SIMPLE:
@@ -1087,7 +1094,7 @@
     String oid = extendedOperation.getRequestOID();
     StringBuilder buffer = new StringBuilder(100);
     appendHeader(extendedOperation, "EXTENDED", CATEGORY_REQUEST, buffer);
-    ExtendedOperationHandler extOpHandler =
+    ExtendedOperationHandler<?> extOpHandler =
       DirectoryServer.getExtendedOperationHandler(oid);
     if (extOpHandler != null) {
       name = extOpHandler.getExtendedOperationName();
@@ -1133,7 +1140,7 @@
     String oid = extendedOperation.getResponseOID();
     if (oid != null)
     {
-      ExtendedOperationHandler extOpHandler =
+      ExtendedOperationHandler<?> extOpHandler =
         DirectoryServer.getExtendedOperationHandler(oid);
       if (extOpHandler != null) {
         name = extOpHandler.getExtendedOperationName();

--
Gitblit v1.10.0