From 853fc2f346b03e3346406656dfad5346dc2d54a6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 11 May 2016 08:02:28 +0000
Subject: [PATCH] Small code cleanups
---
opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java | 6 +++---
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
index cfe47d8..edb5c32 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
@@ -926,12 +926,12 @@
normalizedDN = ByteString.empty();
} else {
final ByteStringBuilder builder = new ByteStringBuilder(size * 8);
- if (parent.normalizedDN == null) {
+ if (parent.normalizedDN != null) {
+ builder.appendBytes(parent.normalizedDN);
+ } else {
for (int i = size() - 1; i > 0; i--) {
parent(i).rdn().toNormalizedByteString(builder);
}
- } else {
- builder.appendBytes(parent.normalizedDN);
}
rdn.toNormalizedByteString(builder);
normalizedDN = builder.toByteString();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
index b18fa8c..403522c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -452,10 +452,10 @@
{
if (isEnabledFor(category, severity))
{
- StringBuilder sb = new StringBuilder();
- sb.append("[");
- sb.append(TimeThread.getLocalTime());
- sb.append("] category=")
+ StringBuilder sb = new StringBuilder()
+ .append("[")
+ .append(TimeThread.getLocalTime())
+ .append("] category=")
.append(category)
.append(" severity=")
.append(severity)
--
Gitblit v1.10.0