summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2014-07-22 15:10:33 +0200
committerAndrew Branson <andrew.branson@cern.ch>2014-07-22 15:10:33 +0200
commit684e91b584d3f74b57bcba31c9810f2d6ec87214 (patch)
tree56c33fef5c8ed938ba56e6a4b7cf53132e090863
parented8037772d068c49800fb4f88697d1f818031120 (diff)
Added NextKeyManager.close method
Made all members protected to allow extension
-rw-r--r--src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java4
-rw-r--r--src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java4
-rw-r--r--src/main/java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java10
-rw-r--r--src/main/java/com/c2kernel/lookup/ldap/LDAPPropertyManager.java4
4 files changed, 14 insertions, 8 deletions
diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java b/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java
index 4c26de6..6b9308b 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java
+++ b/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java
@@ -10,8 +10,8 @@ import com.novell.ldap.LDAPException;
public class LDAPAuthManager implements Authenticator {
- private LDAPConnection mLDAPConn;
- private LDAPProperties ldapProps;
+ protected LDAPConnection mLDAPConn;
+ protected LDAPProperties ldapProps;
@Override
diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java b/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java
index 76d9cbf..0a27a0d 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java
+++ b/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java
@@ -53,8 +53,8 @@ import com.novell.ldap.LDAPSearchResults;
public class LDAPLookup implements LookupManager
{
- private LDAPAuthManager mLDAPAuth;
- private LDAPPropertyManager mPropManager;
+ protected LDAPAuthManager mLDAPAuth;
+ protected LDAPPropertyManager mPropManager;
final String mItemTypeRoot, mDomainTypeRoot, mGlobalPath, mRootPath, mLocalPath, mRolePath;
diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java b/src/main/java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java
index 73296ef..93fcf5c 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java
+++ b/src/main/java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java
@@ -24,8 +24,8 @@ import com.novell.ldap.LDAPEntry;
// public static final String codeRevision = "$Revision: 1.2 $ $Date: 2005/04/27 13:47:24 $ $Author: abranson $";
public class LDAPNextKeyManager implements NextKeyManager {
- LDAPAuthManager ldap;
- String lastKeyPath;
+ protected LDAPAuthManager ldap;
+ protected String lastKeyPath;
public LDAPNextKeyManager() {
}
@@ -94,4 +94,10 @@ public class LDAPNextKeyManager implements NextKeyManager {
}
+ @Override
+ public void close() {
+ ldap = null;
+ lastKeyPath = null;
+ }
+
}
diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPPropertyManager.java b/src/main/java/com/c2kernel/lookup/ldap/LDAPPropertyManager.java
index 1b6e906..30bc9d7 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPPropertyManager.java
+++ b/src/main/java/com/c2kernel/lookup/ldap/LDAPPropertyManager.java
@@ -24,8 +24,8 @@ public class LDAPPropertyManager {
/**
*
*/
- protected LDAPLookup ldap;
- private final LDAPAuthManager auth;
+ protected final LDAPLookup ldap;
+ protected final LDAPAuthManager auth;
public LDAPPropertyManager(LDAPLookup ldap, LDAPAuthManager auth) {
super();