From 8c800dbbb7ca355ced2df288dd68dd162ef78d53 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 03 Aug 2010 16:04:14 +0000
Subject: [PATCH] Fix issue 4575. dsreplication was failing with Sun JVM 1.6.0_21. In fact, the updated JVM is stricter in JNDI's LDAP filter parsing.
---
opends/src/ads/org/opends/admin/ads/ServerDescriptor.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
index c578579..6ee86b3 100644
--- a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
+++ b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
@@ -55,10 +55,11 @@
*/
public class ServerDescriptor
{
- private Map<ADSContext.ServerProperty, Object> adsProperties =
+ private final Map<ADSContext.ServerProperty, Object> adsProperties =
new HashMap<ADSContext.ServerProperty, Object>();
- private Set<ReplicaDescriptor> replicas = new HashSet<ReplicaDescriptor>();
- private Map<ServerProperty, Object> serverProperties =
+ private final Set<ReplicaDescriptor> replicas =
+ new HashSet<ReplicaDescriptor>();
+ private final Map<ServerProperty, Object> serverProperties =
new HashMap<ServerProperty, Object>();
private TopologyCacheException lastException;
@@ -1330,7 +1331,7 @@
new String[] {
"ds-sync-generation-id"
});
- String filter = "|(objectclass=*)(objectclass=ldapsubentry)";
+ String filter = "(|(objectclass=*)(objectclass=ldapsubentry))";
LdapName jndiName = new LdapName("cn=schema");
NamingEnumeration<SearchResult> listeners =
--
Gitblit v1.10.0