From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/crypto/CryptoManagerSync.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java b/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java
index e9b3000..4bd43ef 100644
--- a/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java
@@ -49,6 +49,7 @@
import static org.opends.server.config.ConfigConstants.OC_CRYPTO_MAC_KEY;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
+import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.controls.PersistentSearchChangeType;
import org.opends.server.controls.EntryChangeNotificationControl;
import org.opends.server.core.DirectoryServer;
@@ -299,11 +300,19 @@
{
if (c.getOID().equals(OID_ENTRY_CHANGE_NOTIFICATION))
{
- ecn = EntryChangeNotificationControl.decodeControl(c);
+ if (c instanceof LDAPControl)
+ {
+ ecn = EntryChangeNotificationControl.DECODER.decode(c
+ .isCritical(), ((LDAPControl) c).getValue());
+ }
+ else
+ {
+ ecn = (EntryChangeNotificationControl)c;
+ }
}
}
}
- catch (LDAPException e)
+ catch (DirectoryException e)
{
// ignore
}
--
Gitblit v1.10.0