From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
index ef879c4..6939216 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
@@ -218,7 +218,7 @@
if(policy instanceof SizeBasedRotationPolicy)
{
- SizeBasedRotationPolicy sizePolicy = ((SizeBasedRotationPolicy)policy);
+ SizeBasedRotationPolicy sizePolicy = (SizeBasedRotationPolicy) policy;
if(sizeLimit == 0 ||
sizeLimit > sizePolicy.currentConfig.getFileSizeLimit())
{
@@ -251,7 +251,7 @@
sizeLimit = 0;
// Remove this as a change listener.
- SizeBasedRotationPolicy sizePolicy = ((SizeBasedRotationPolicy)policy);
+ SizeBasedRotationPolicy sizePolicy = (SizeBasedRotationPolicy) policy;
sizePolicy.currentConfig.removeSizeLimitChangeListener(this);
}
}
@@ -360,26 +360,17 @@
{
long newSizeLimit = Integer.MAX_VALUE;
- // Go through all current size rotation policies and get the
- // lowest size setting.
+ // Go through all current size rotation policies and get the lowest size setting.
for(RotationPolicy policy : rotationPolicies)
{
if(policy instanceof SizeBasedRotationPolicy)
{
- SizeBasedRotationPolicy sizePolicy = ((SizeBasedRotationPolicy)policy);
- if(sizePolicy.currentConfig.dn().equals(config.dn()) )
+ SizeBasedRotationPolicy sizePolicy = (SizeBasedRotationPolicy) policy;
+ SizeLimitLogRotationPolicyCfg cfg =
+ sizePolicy.currentConfig.dn().equals(config.dn()) ? config : sizePolicy.currentConfig;
+ if(newSizeLimit > cfg.getFileSizeLimit())
{
- if(newSizeLimit > config.getFileSizeLimit())
- {
- newSizeLimit = config.getFileSizeLimit();
- }
- }
- else
- {
- if(newSizeLimit > sizePolicy.currentConfig.getFileSizeLimit())
- {
- newSizeLimit = sizePolicy.currentConfig.getFileSizeLimit();
- }
+ newSizeLimit = cfg.getFileSizeLimit();
}
}
}
--
Gitblit v1.10.0