From c96af91cdd11f79c11e56d6c7fe33d0edc653ea3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 15 Apr 2013 12:08:55 +0000
Subject: [PATCH] OPENDJ-832 (CR-1545) Leverage the work queue for processing requests received on the HTTP connection handler
---
opends/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/opends/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opends/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index cff6a52..d8c8d9a 100644
--- a/opends/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opends/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -962,8 +962,7 @@
@Override
public boolean isConnectLoggable(final ClientConnection connection)
{
- final long connectionID = connection.getConnectionID();
- if (connectionID >= 0 || !suppressInternalOperations)
+ if (!connection.isInnerConnection() || !suppressInternalOperations)
{
switch (policy)
{
@@ -989,8 +988,7 @@
@Override
public boolean isDisconnectLoggable(final ClientConnection connection)
{
- final long connectionID = connection.getConnectionID();
- if (connectionID >= 0 || !suppressInternalOperations)
+ if (!connection.isInnerConnection() || !suppressInternalOperations)
{
switch (policy)
{
@@ -1071,21 +1069,9 @@
*/
boolean isLoggable(final Operation operation)
{
- final long connectionID = operation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (operation.isSynchronizationOperation())
- {
- return !suppressSynchronizationOperations;
- }
- else
- {
- return !suppressInternalOperations;
- }
- }
-
- return true;
+ return !((suppressInternalOperations && operation.isInnerOperation())
+ || (suppressSynchronizationOperations
+ && operation.isSynchronizationOperation()));
}
}
--
Gitblit v1.10.0