From 5ae40296386ae7b3465f2bc23cf41ce227a40bbc Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 14:21:42 +0000
Subject: [PATCH] Removed useless empty lines that would survive source code formatting.
---
opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java | 2
opendj3-server-dev/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java | 4 -
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/StopWindowsService.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 1
opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java | 2
opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java | 1
opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java | 1
opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java | 3 -
opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/StartWindowsService.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/util/args/IntegerArgument.java | 1
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java | 3 -
opendj3-server-dev/src/server/org/opends/server/util/args/FileBasedArgument.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java | 6 --
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java | 4 -
opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java | 2
opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java | 1
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java | 1
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/SSLConnectionFactory.java | 1
opendj3-server-dev/src/build-tools/org/opends/build/tools/CoverageDiff.java | 1
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java | 4 -
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 3 -
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 3 -
opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java | 3 -
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java | 8 --
opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java | 6 --
opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 4 -
opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java | 2
opendj3-server-dev/src/server/org/opends/server/util/Platform.java | 1
opendj3-server-dev/src/server/org/opends/server/core/LockFileManager.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java | 3 -
opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java | 6 --
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java | 1
opendj3-server-dev/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java | 1
opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java | 16 -----
opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java | 3 -
60 files changed, 1 insertions(+), 133 deletions(-)
diff --git a/opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java b/opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java
index 57e2e90..549995f 100644
--- a/opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java
+++ b/opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContext.java
@@ -1881,7 +1881,6 @@
if (attr.size() >= 1 &&
MULTIVALUED_SERVER_GROUP_PROPERTIES.contains(prop))
{
-
Set<String> set = new HashSet<String>();
NamingEnumeration<?> ae = attr.getAll();
try
@@ -1954,7 +1953,6 @@
}
else
{
-
if (attr.size() >= 1 && MULTIVALUED_SERVER_PROPERTIES.contains(prop))
{
Set<String> set = new HashSet<String>();
diff --git a/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java b/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
index efcb3ae..61cb3a5 100644
--- a/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
@@ -385,7 +385,6 @@
result.addToEnvironment(STARTTLS_PROPERTY, "true");
if (fDn != null)
{
-
result.addToEnvironment(Context.SECURITY_AUTHENTICATION , "simple");
result.addToEnvironment(Context.SECURITY_PRINCIPAL, fDn);
if (fPwd != null)
diff --git a/opendj3-server-dev/src/build-tools/org/opends/build/tools/CoverageDiff.java b/opendj3-server-dev/src/build-tools/org/opends/build/tools/CoverageDiff.java
index 77efe5d..34e30de 100644
--- a/opendj3-server-dev/src/build-tools/org/opends/build/tools/CoverageDiff.java
+++ b/opendj3-server-dev/src/build-tools/org/opends/build/tools/CoverageDiff.java
@@ -921,7 +921,6 @@
}
else
{
-
final HTMLTable.ICell cell = row.newCell ();
cell.setText (" ", true);
}
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
index 0e5b9be..cab5f90 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
@@ -212,7 +212,6 @@
*/
public void actionPerformed(ActionEvent ev)
{
-
if (editOcDlg == null)
{
editOcPanel = new ObjectClassEditorPanel();
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index 5c0235c..2fc56f0 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -1605,7 +1605,6 @@
StringBuilder msg = new StringBuilder();
for (String m : col)
{
-
if (msg.length() > 0)
{
msg.append(separator);
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 8b7bb70..b0ccaa7 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -4275,7 +4275,6 @@
ServerDescriptor.ServerProperty.IS_REPLICATION_SERVER);
if (!Boolean.TRUE.equals(v))
{
-
AuthenticationData authData = new AuthenticationData();
authData.setPort(Constants.DEFAULT_REPLICATION_PORT);
authData.setUseSecureConnection(false);
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
index d44cd01..e405c65 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -619,7 +619,6 @@
StringBuilder msg = new StringBuilder();
for (String m : col)
{
-
if (msg.length() > 0)
{
msg.append(separator);
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java
index 42cb67b..b4064cb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java
@@ -819,7 +819,6 @@
// -----------------------
else if (subCmd.getName().equals(listMembershipSubCmd.getName()))
{
-
ctx = argParser.getContext(outStream, errStream);
if (ctx == null)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
index 9c44134..46c20b5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -3876,7 +3876,6 @@
}
else
{
-
LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_WRITE_ORIG_FILES_NOT_CLEANED
.get(getExceptionMessage(e));
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 94b6945..c85b585 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -1277,7 +1277,6 @@
if (results.isDefined() &&
results.size() <= IndexFilter.FILTER_CANDIDATE_THRESHOLD)
{
-
if(debugBuffer != null)
{
debugBuffer.append("[INDEX:");
@@ -1831,7 +1830,6 @@
// already exists. Just update index entry limit.
if(this.equalityIndex.setIndexEntryLimit(indexEntryLimit))
{
-
adminActionRequired = true;
LocalizableMessage message =
NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
@@ -2677,7 +2675,6 @@
try
{
-
if(debugBuffer != null)
{
debugBuffer.append("[INDEX:");
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
index c5d48e8..dd58821 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
@@ -636,7 +636,6 @@
status == OperationStatus.SUCCESS;
status = cursor.getNextNoDup(key, data, LockMode.DEFAULT))
{
-
int cmp = dn2uriComparator.compare(key.getData(), end);
if (cmp >= 0)
{
@@ -685,7 +684,6 @@
{
if (ldapurl.getBaseDN().isRootDN())
{
-
ldapurl.setBaseDN(dn);
}
ldapurl.getAttributes().clear();
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index b89bfe4..5d4ea3f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -1163,7 +1163,6 @@
Set<byte[]> dummySet = new AbstractSet<byte[]>()
{
-
public Iterator<byte[]> iterator()
{
// The set is always empty.
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 411d522..87eb9fe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -1367,7 +1367,6 @@
while (status == OperationStatus.SUCCESS
&& !importConfiguration.isCancelled() && !isCanceled)
{
-
boolean found = false;
for (byte[] includeBranch : includeBranches)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
index 5083574..659b832 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -287,7 +287,6 @@
try
{
-
LocalizableMessage message = INFO_TASKBE_INTERRUPTED_BY_SHUTDOWN.get();
taskScheduler.interruptRunningTasks(TaskState.STOPPED_BY_SHUTDOWN,
@@ -1954,7 +1953,6 @@
}
else if (! p.exists())
{
-
unacceptableReasons.add(ERR_TASKBE_BACKING_FILE_MISSING_PARENT.get(
p.getPath(),
tmpBackingFile));
@@ -2007,7 +2005,6 @@
File f = getFileForPath(tmpBackingFile);
if (f.exists())
{
-
messages.add(ERR_TASKBE_BACKING_FILE_EXISTS.get(tmpBackingFile));
resultCode = ResultCode.CONSTRAINT_VIOLATION;
}
@@ -2016,7 +2013,6 @@
File p = f.getParentFile();
if (p == null)
{
-
messages.add(ERR_TASKBE_INVALID_BACKING_FILE_PATH.get(
tmpBackingFile));
resultCode = ResultCode.CONSTRAINT_VIOLATION;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
index 34e08cc..d623432 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
@@ -903,7 +903,6 @@
if (hasLowerBound && (longValue < lowerBound))
{
-
LocalizableMessage message = ERR_CONFIG_ATTR_INT_BELOW_LOWER_BOUND.get(
getName(), longValue, lowerBound);
if (allowFailures)
@@ -1279,7 +1278,6 @@
*/
public javax.management.Attribute toJMXAttribute()
{
-
return _toJMXAttribute(false);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
index 5c5c875..b4a1ebf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
@@ -1122,7 +1122,6 @@
*/
public javax.management.Attribute toJMXAttributePending()
{
-
return new javax.management.Attribute(getName() + ";"
+ OPTION_PENDING_VALUES, pendingIntValue + " " + pendingUnit);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
index d66811c..b7ca2ce 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
@@ -171,7 +171,6 @@
*/
public JMXMBean(DN configEntryDN)
{
-
this.configEntryDN = configEntryDN;
alertGenerators = new CopyOnWriteArrayList<AlertGenerator>();
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
index 8727bf0..1eac55a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
@@ -401,7 +401,6 @@
Class backendClass = DirectoryServer.loadClass(className);
if (! Backend.class.isAssignableFrom(backendClass))
{
-
unacceptableReason.add(ERR_CONFIG_BACKEND_CLASS_NOT_BACKEND.get(className, backendDN));
return false;
}
@@ -1131,7 +1130,6 @@
}
else
{
-
messages.add(NOTE_CONFIG_BACKEND_CANNOT_REMOVE_BACKEND_WITH_SUBORDINATES.get(backendDN));
resultCode = ResultCode.UNWILLING_TO_PERFORM;
return new ConfigChangeResult(resultCode, adminActionRequired, messages);
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/LockFileManager.java b/opendj3-server-dev/src/server/org/opends/server/core/LockFileManager.java
index 83a1753..87d91fb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/LockFileManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/LockFileManager.java
@@ -85,7 +85,6 @@
// then we can't get a shared lock on it.
if (exclusiveLocks.containsKey(lockFile))
{
-
failureReason.append(
ERR_FILELOCKER_LOCK_SHARED_REJECTED_BY_EXCLUSIVE.get(lockFile));
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java
index fa7bbd3..7d854ed 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java
@@ -156,7 +156,6 @@
String workQueueClass = configuration.getJavaClass();
if (! workQueueClass.equals(workQueue.getClass().getName()))
{
-
messages.add(INFO_CONFIG_WORK_QUEUE_CLASS_CHANGE_REQUIRES_RESTART.get(
workQueue.getClass().getName(),
workQueueClass));
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
index dfc438b..755b9fc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
@@ -184,7 +184,6 @@
(config.isCheckSubstrings() &&
containsSubstring(password, minSubstringLength, a)))
{
-
invalidReason.append(ERR_ATTRVALUE_VALIDATOR_PASSWORD_IN_ENTRY.get());
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
index e8380ee..0e24ac8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -235,7 +235,6 @@
int sharpPos = valueStr.indexOf('#');
if (sharpPos < 0)
{
-
invalidReason.append(
ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_SHARP.get(valueStr));
return false;
@@ -247,7 +246,6 @@
int ocLength = ocName.length();
if (ocLength == 0)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_OC.get(valueStr));
return false;
}
@@ -262,7 +260,6 @@
int lastSharpPos = valueStr.lastIndexOf('#');
if (lastSharpPos == sharpPos)
{
-
invalidReason.append(
ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_FINAL_SHARP.get(valueStr));
return false;
@@ -275,13 +272,11 @@
{
if (scopeStr.length() == 0)
{
-
invalidReason.append(
ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_SCOPE.get(valueStr));
}
else
{
-
invalidReason.append(
ERR_ATTR_SYNTAX_ENHANCEDGUIDE_INVALID_SCOPE.get(
valueStr, scopeStr));
@@ -297,7 +292,6 @@
int criteriaLength = criteria.length();
if (criteriaLength == 0)
{
-
invalidReason.append(
ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_CRITERIA.get(valueStr));
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
index 1d4d5db..2e1bc18 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
@@ -264,7 +264,6 @@
// The value must contain at least one character.
if (valueLength == 0)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_EMPTY.get());
return false;
}
@@ -305,7 +304,6 @@
// character was a dollar sign.
if (c == '$')
{
-
invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_END_WITH_DOLLAR.get(
valueString));
return false;
@@ -328,7 +326,6 @@
String paramStr = valueString.substring(paramStartPos, pos);
if (! ALLOWED_FAX_PARAMETERS.contains(paramStr))
{
-
invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_ILLEGAL_PARAMETER.get(
valueString, paramStr, paramStartPos, (pos-1)));
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
index f4a05c9..ab86af7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
@@ -241,7 +241,6 @@
int ocLength = ocName.length();
if (ocLength == 0)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_GUIDE_NO_OC.get(valueStr));
return false;
}
@@ -322,7 +321,6 @@
}
else
{
-
invalidReason.append(
ERR_ATTR_SYNTAX_GUIDE_ILLEGAL_CHAR.get(
valueStr, criteria, c, (i+1)));
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 63d772d..48e736b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -288,7 +288,6 @@
char c = valueStr.charAt(pos++);
if (c != '(')
{
-
LocalizableMessage message =
ERR_ATTR_SYNTAX_LDAPSYNTAX_EXPECTED_OPEN_PARENTHESIS.get(valueStr, (pos-1), c);
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index 04154d1..0ed6831 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -301,7 +301,6 @@
{
if (lastWasPeriod)
{
-
invalidReason.append(
ERR_ATTR_SYNTAX_MR_DOUBLE_PERIOD_IN_NUMERIC_OID.get(
valueStr, (pos-1)));
@@ -349,7 +348,6 @@
// description. Otherwise, parse out the OID.
if (pos >= length)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_MR_TRUNCATED_VALUE.get(valueStr));
return false;
}
@@ -408,7 +406,6 @@
// We must be at the end of the value. If not, then that's a problem.
if (pos < length)
{
-
invalidReason.append(
ERR_ATTR_SYNTAX_MR_UNEXPECTED_CLOSE_PARENTHESIS.get(
valueStr, (pos-1)));
@@ -587,7 +584,6 @@
// Make sure that a syntax was specified.
if (syntax == null)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_MR_NO_SYNTAX.get(valueStr));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index 4e992ee..8676f8b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -266,7 +266,6 @@
char c = valueString.charAt(i);
if (! ((c == '0') || (c == '1')))
{
-
invalidReason.append(
ERR_ATTR_SYNTAX_NAMEANDUID_ILLEGAL_BINARY_DIGIT.get(valueString, c, i));
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
index 561c12d..ed5ce49 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
@@ -233,7 +233,6 @@
// It must have at least one digit or space.
if (length == 0)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_NUMERIC_STRING_EMPTY_VALUE.get());
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
index b2c4098..4ad1f4e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
@@ -220,7 +220,6 @@
// acceptable.
if (value == null)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_EMPTY_VALUE.get());
return false;
}
@@ -232,7 +231,6 @@
int valueLength = valueString.length();
if (valueLength == 0)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_EMPTY_VALUE.get());
return false;
}
@@ -248,7 +246,6 @@
{
if (pos == 0)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_NO_MBTYPE.get(
valueString));
return false;
@@ -269,7 +266,6 @@
// Make sure there is at least one character left for the mailbox.
if (pos >= valueLength)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_NO_MAILBOX.get(
valueString));
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
index 1beea7c..a4e883a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
@@ -241,7 +241,6 @@
// acceptable.
if (value == null)
{
-
invalidReason.append(WARN_ATTR_SYNTAX_PRINTABLE_STRING_EMPTY_VALUE.get());
return false;
}
@@ -253,7 +252,6 @@
int valueLength = valueString.length();
if (valueLength == 0)
{
-
invalidReason.append(WARN_ATTR_SYNTAX_PRINTABLE_STRING_EMPTY_VALUE.get());
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index ec555d6..54c1515 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -265,7 +265,6 @@
// The value must contain at least one character.
if (valueLength == 0)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_EMPTY.get());
return false;
}
@@ -306,7 +305,6 @@
// character was a dollar sign.
if (c == '$')
{
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_END_WITH_DOLLAR.get(
valueString));
return false;
@@ -344,7 +342,6 @@
int colonPos = paramStr.indexOf(':');
if (colonPos < 0)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_PARAM_NO_COLON.get(
valueString));
return false;
@@ -353,7 +350,6 @@
String paramName = paramStr.substring(0, colonPos);
if (! ALLOWED_TTX_PARAMETERS.contains(paramName))
{
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_ILLEGAL_PARAMETER.get(
valueString, paramName));
return false;
@@ -370,7 +366,6 @@
int colonPos = paramStr.indexOf(':');
if (colonPos < 0)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_PARAM_NO_COLON.get(
valueString));
return false;
@@ -379,7 +374,6 @@
String paramName = paramStr.substring(0, colonPos);
if (! ALLOWED_TTX_PARAMETERS.contains(paramName))
{
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_ILLEGAL_PARAMETER.get(
valueString, paramName));
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
index fb5f012..0005064 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -228,7 +228,6 @@
if (valueLength < 5)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_TOO_SHORT.get(valueString));
return false;
}
@@ -265,7 +264,6 @@
if (pos >= valueLength)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_TRUNCATED.get(valueString));
return false;
}
@@ -302,7 +300,6 @@
if (pos >= valueLength)
{
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_TRUNCATED.get(valueString));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
index c6290c6..4d63895 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
@@ -219,7 +219,6 @@
String valueString = value.toString();
if (valueString.length() != 36)
{
-
invalidReason.append(WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(valueString,
valueString.length()));
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java b/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
index 14498a5..7072aea 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
@@ -78,7 +78,6 @@
{
try
{
-
StringConfigAttribute idStub =
new StringConfigAttribute(
ATTR_BACKEND_ID,
@@ -154,7 +153,6 @@
String backendID;
try
{
-
StringConfigAttribute idStub =
new StringConfigAttribute(
ATTR_BACKEND_ID,
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java b/opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java
index c3bcfa9..60dc7e0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java
@@ -122,7 +122,6 @@
String backendID;
try
{
-
StringConfigAttribute idStub =
new StringConfigAttribute(ATTR_BACKEND_ID,
INFO_CONFIG_BACKEND_ATTR_DESCRIPTION_BACKEND_ID.get(), true,
@@ -154,7 +153,6 @@
String backendClassName;
try
{
-
StringConfigAttribute classStub =
new StringConfigAttribute(ATTR_BACKEND_CLASS,
INFO_CONFIG_BACKEND_ATTR_DESCRIPTION_CLASS.get(), true, false,
@@ -213,7 +211,6 @@
List<DN> baseDNs = null;
try
{
-
DNConfigAttribute baseDNStub =
new DNConfigAttribute(ATTR_BACKEND_BASE_DN,
INFO_CONFIG_BACKEND_ATTR_DESCRIPTION_BASE_DNS.get(), true,
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
index e9152c2..984baa9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
@@ -715,7 +715,6 @@
// If no DNs were provided, then exit with an error.
if (dnStrings.isEmpty() && (! filename.isPresent()) )
{
-
err.println(wrapText(ERR_LDAPCOMPARE_NO_DNS.get(), MAX_LINE_WIDTH));
return CLIENT_SIDE_PARAM_ERROR;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
index 3e7a9c6..f3f717a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
@@ -362,7 +362,6 @@
}
else if (c.getOID().equals(OID_NS_PASSWORD_EXPIRED))
{
-
LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRED.get();
out.println(message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
index 8fde4c1..f1bb54f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
@@ -198,7 +198,6 @@
}
else
{
-
LocalizableMessage msg = INFO_OPERATION_FAILED.get("DELETE");
err.println(wrapText(msg, MAX_LINE_WIDTH));
err.println(wrapText(ae.getMessage(), MAX_LINE_WIDTH));
@@ -220,13 +219,11 @@
{
if(resultCode != SUCCESS && resultCode != REFERRAL)
{
-
LocalizableMessage msg = INFO_OPERATION_FAILED.get("DELETE");
LDAPToolUtils.printErrorMessage(err, msg, resultCode, errorMessage,
op.getMatchedDN());
} else
{
-
LocalizableMessage msg = INFO_OPERATION_SUCCESSFUL.get("DELETE", line);
out.println(msg);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
index f10c688..6c022e8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
@@ -478,7 +478,6 @@
}
catch (DirectoryException de)
{
-
err.println(wrapText(
ERR_LDAPMODIFY_POSTREAD_CANNOT_DECODE_VALUE.get(
de.getMessage()),
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
index d5eb90b..50162f4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -830,7 +830,6 @@
LocalizableMessage errorMessage = extendedResponse.getErrorMessage();
if ((errorMessage != null) && (errorMessage.length() > 0))
{
-
message = ERR_LDAPPWMOD_FAILURE_ERROR_MESSAGE.get(errorMessage);
err.println(wrapText(message, MAX_LINE_WIDTH));
}
@@ -838,7 +837,6 @@
DN matchedDN = extendedResponse.getMatchedDN();
if (matchedDN != null)
{
-
message = ERR_LDAPPWMOD_FAILURE_MATCHED_DN.get(matchedDN);
err.println(wrapText(message, MAX_LINE_WIDTH));
}
@@ -867,7 +865,6 @@
LocalizableMessage additionalInfo = extendedResponse.getErrorMessage();
if ((additionalInfo != null) && (additionalInfo.length() > 0))
{
-
message = INFO_LDAPPWMOD_ADDITIONAL_INFO.get(additionalInfo);
out.println(wrapText(message, MAX_LINE_WIDTH));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
index 5586902..990ff0e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
@@ -199,7 +199,6 @@
out.println(INFO_LDAPSEARCH_ACCTUSABLE_HEADER.get());
if (acrc.isUsable())
{
-
out.println(INFO_LDAPSEARCH_ACCTUSABLE_IS_USABLE.get());
if (acrc.getSecondsBeforeExpiration() > 0)
{
@@ -213,12 +212,10 @@
}
else
{
-
out.println(
INFO_LDAPSEARCH_ACCTUSABLE_NOT_USABLE.get());
if (acrc.isInactive())
{
-
out.println(
INFO_LDAPSEARCH_ACCTUSABLE_ACCT_INACTIVE.get());
}
@@ -229,13 +226,11 @@
}
if (acrc.isExpired())
{
-
out.println(
INFO_LDAPSEARCH_ACCTUSABLE_PW_EXPIRED.get());
if (acrc.getRemainingGraceLogins() > 0)
{
-
out.println(
INFO_LDAPSEARCH_ACCTUSABLE_REMAINING_GRACE
.get(acrc.getRemainingGraceLogins()));
@@ -243,7 +238,6 @@
}
if (acrc.isLocked())
{
-
out.println(INFO_LDAPSEARCH_ACCTUSABLE_LOCKED.get());
if (acrc.getSecondsBeforeUnlock() > 0)
{
@@ -1073,7 +1067,6 @@
argParser.setUsageArgument(showUsage, out);
} catch (ArgumentException ae)
{
-
LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
@@ -1664,7 +1657,6 @@
if(filters.isEmpty())
{
-
err.println(wrapText(ERR_SEARCH_NO_FILTERS.get(), MAX_LINE_WIDTH));
err.println(argParser.getUsage());
return CLIENT_SIDE_PARAM_ERROR;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
index b111416..07efec3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
@@ -133,7 +133,6 @@
searchScope = SUBORDINATE_SUBTREE;
} else
{
-
err.println(ERR_SEARCH_INVALID_SEARCH_SCOPE.get(scope));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/SSLConnectionFactory.java b/opendj3-server-dev/src/server/org/opends/server/tools/SSLConnectionFactory.java
index 1fbe688..7bfecf4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/SSLConnectionFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/SSLConnectionFactory.java
@@ -216,7 +216,6 @@
{
if(sslSocketFactory == null)
{
-
throw new SSLConnectionException(
ERR_TOOLS_SSL_CONNECTION_NOT_INITIALIZED.get());
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/StartWindowsService.java b/opendj3-server-dev/src/server/org/opends/server/tools/StartWindowsService.java
index 6f685de..1c0f711 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/StartWindowsService.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/StartWindowsService.java
@@ -90,7 +90,6 @@
String serviceName = ConfigureWindowsService.getServiceName();
if (serviceName == null)
{
-
LocalizableMessage message = ERR_WINDOWS_SERVICE_NOT_FOUND.get();
err.println(message);
returnValue = SERVICE_NOT_FOUND;
@@ -132,7 +131,6 @@
}
catch (Throwable t)
{
-
LocalizableMessage message = ERR_WINDOWS_SERVICE_START_ERROR.get();
err.println(message);
err.println("Exception:" + t.toString());
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/StopWindowsService.java b/opendj3-server-dev/src/server/org/opends/server/tools/StopWindowsService.java
index 862c1a3..8ed4a14 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/StopWindowsService.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/StopWindowsService.java
@@ -89,7 +89,6 @@
String serviceName = ConfigureWindowsService.getServiceName();
if (serviceName == null)
{
-
LocalizableMessage message = ERR_WINDOWS_SERVICE_NOT_FOUND.get();
err.println(message);
returnValue = SERVICE_NOT_FOUND;
@@ -136,7 +135,6 @@
}
catch (Throwable t)
{
-
LocalizableMessage message = ERR_WINDOWS_SERVICE_STOP_ERROR.get();
err.println(message);
err.println("Exception:" + t.toString());
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
index 18d37b6..d127703 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
@@ -187,7 +187,6 @@
}
catch (ArgumentException ae)
{
-
LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
@@ -202,7 +201,6 @@
}
catch (ArgumentException ae)
{
-
LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 1ec445c..93433cf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -3842,7 +3842,6 @@
{
for (ReplicaDescriptor rep2 : replicas2)
{
-
switch (type)
{
case NOT_REPLICATED:
@@ -4134,7 +4133,6 @@
if (!uData.configureReplicationServer1() && repPort1 > 0)
{
-
println(INFO_REPLICATION_SERVER_CONFIGURED_WARNING.get(
ConnectionUtils.getHostPort(ctx1), repPort1));
println();
@@ -8815,7 +8813,6 @@
}
if (replicationServer != null)
{
-
String s = String.valueOf(replicationServer.getReplicationPort());
printProgress(formatter.getFormattedWithPoints(
INFO_REPLICATION_DISABLING_REPLICATION_SERVER.get(s,
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java b/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
index ac6f2a0..de1d4c5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
@@ -3539,7 +3539,6 @@
if ((attributeType == null) ||
attributeType.equals(rdn.getAttributeType(i)))
{
-
AttributeValue v = rdn.getAttributeValue(i);
ByteString nv =
matchingRule.normalizeValue(v.getValue());
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java b/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java
index 7ac4e18..714207b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java
@@ -83,7 +83,6 @@
*/
public AndRefinement(final Collection<Refinement> refinementSet)
{
-
this.refinementSet = refinementSet;
}
@@ -95,7 +94,6 @@
@Override
public boolean equals(final Object obj)
{
-
if (this == obj)
{
return true;
@@ -119,7 +117,6 @@
@Override
public int hashCode()
{
-
return refinementSet.hashCode();
}
@@ -197,7 +194,6 @@
*/
public FilterRefinement(final SearchFilter filter)
{
-
this.filter = filter;
}
@@ -209,7 +205,6 @@
@Override
public boolean equals(final Object obj)
{
-
if (this == obj)
{
return true;
@@ -232,7 +227,6 @@
@Override
public int hashCode()
{
-
return filter.hashCode();
}
@@ -294,7 +288,6 @@
*/
public ItemRefinement(final String objectClass)
{
-
this.objectClass = objectClass;
this.normalizedObjectClass = StaticUtils
.toLowerCase(objectClass.trim());
@@ -308,7 +301,6 @@
@Override
public boolean equals(final Object obj)
{
-
if (this == obj)
{
return true;
@@ -333,7 +325,6 @@
@Override
public int hashCode()
{
-
return normalizedObjectClass.hashCode();
}
@@ -395,7 +386,6 @@
*/
public NotRefinement(final Refinement refinement)
{
-
this.refinement = refinement;
}
@@ -407,7 +397,6 @@
@Override
public boolean equals(final Object obj)
{
-
if (this == obj)
{
return true;
@@ -431,7 +420,6 @@
@Override
public int hashCode()
{
-
return refinement.hashCode();
}
@@ -482,7 +470,6 @@
*/
public OrRefinement(final Collection<Refinement> refinementSet)
{
-
this.refinementSet = refinementSet;
}
@@ -494,7 +481,6 @@
@Override
public boolean equals(final Object obj)
{
-
if (this == obj)
{
return true;
@@ -518,7 +504,6 @@
@Override
public int hashCode()
{
-
return refinementSet.hashCode();
}
@@ -1679,7 +1664,6 @@
if ((chopBefore.iterator().hasNext())
|| (chopAfter.iterator().hasNext()))
{
-
if (!isFirstElement)
{
builder.append(",");
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java
index 6e2d900..a414060 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java
@@ -148,7 +148,6 @@
{
if (startPos + breakColumn >= l.length())
{
-
writer.write("# ");
writer.write(l.substring(startPos));
writer.newLine();
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/Platform.java b/opendj3-server-dev/src/server/org/opends/server/util/Platform.java
index ef94dd5..b45c154 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/Platform.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/Platform.java
@@ -558,7 +558,6 @@
static
{
-
Method normalize = null;
Object formNFKC = null;
try
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/args/FileBasedArgument.java b/opendj3-server-dev/src/server/org/opends/server/util/args/FileBasedArgument.java
index 384ac81..9303b23 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/args/FileBasedArgument.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/args/FileBasedArgument.java
@@ -235,7 +235,6 @@
// If the line read is null, then that means the file was empty.
if (line == null)
{
-
invalidReason.append(ERR_FILEARG_EMPTY_FILE.get(valueString, getName()));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/args/IntegerArgument.java b/opendj3-server-dev/src/server/org/opends/server/util/args/IntegerArgument.java
index 468606e..f67ba53 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/args/IntegerArgument.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/args/IntegerArgument.java
@@ -361,7 +361,6 @@
// it.
if (hasUpperBound && (intValue > upperBound))
{
-
invalidReason.append(ERR_INTARG_VALUE_ABOVE_UPPER_BOUND.get(
getName(), intValue, upperBound));
return false;
diff --git a/opendj3-server-dev/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java b/opendj3-server-dev/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java
index 496d85d..e8ad6d8 100644
--- a/opendj3-server-dev/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java
+++ b/opendj3-server-dev/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java
@@ -77,8 +77,6 @@
public static void main( String[] args )
{
-
-
FileWriter out = null;
files = new HashMap<String,File>();
diff --git a/opendj3-server-dev/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java b/opendj3-server-dev/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
index af89791..999574d 100644
--- a/opendj3-server-dev/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
+++ b/opendj3-server-dev/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
@@ -211,11 +211,9 @@
for(int k = 0; k < arrayTests.size(); k++)
{
-
ArrayData testSuitePath = (ArrayData)(arrayTests.get(k));
if(testSuitePath.size() > 0)
- {
-
+ {
String specPath=testSuitePath.getTestSuite(0);
String specName = (new File(specPath)).getName();
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
index 67bdd8a..b87cb01 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
@@ -253,8 +253,6 @@
{
if(vlvIndex.getName().contains("testvlvindex"))
{
-
-
SortValuesSet svs1 =
vlvIndex.getSortValuesSet(null, 0,
expectedSortedValues.first().getValues());
@@ -282,8 +280,6 @@
{
if(vlvIndex.getName().contains("testvlvindex"))
{
-
-
SortValuesSet svs1 =
vlvIndex.getSortValuesSet(null, 0,
expectedSortedValues.first().getValues());
@@ -316,8 +312,6 @@
{
if(vlvIndex.getName().contains("testvlvindex"))
{
-
-
SortValuesSet svs1 =
vlvIndex.getSortValuesSet(null, 0,
expectedSortedValues.first().getValues());
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
index 9bb44ae..8ca62ba 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
@@ -383,7 +383,6 @@
// Check null, null
try
{
-
mvf = MatchedValuesFilter.createGreaterOrEqualFilter((String) null,
(ByteString) null);
assertTrue(false, "Expected NullPointerException");
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
index 941ac6b..9da9a57 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
@@ -438,7 +438,6 @@
{
if(line.startsWith(userCert))
{
-
builder.append("userCertificate:");
builder.append(line.substring(userCert.length()+1, line.length()));
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
index 691f533..38ab83a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
@@ -315,7 +315,6 @@
public FakeReplicationServer(byte groupId, int port, int serverId, boolean assured,
String testcase)
{
-
this.groupId = groupId;
this.port = port;
this.serverId = serverId;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
index a458aca..f44afdb 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
@@ -447,7 +447,6 @@
try
{
-
int DEGRADED_STATUS_THRESHOLD = 1;
// RS1 starts with 1 message as degraded status threshold value
--
Gitblit v1.10.0