diff --git a/src/com/octetstring/jdbcLdap/jndi/Delete.java b/src/com/octetstring/jdbcLdap/jndi/Delete.java
index 72eac27fc393f934cc389f1ac7a8f124655f2b93..876ea1a97e752c301e3754d125179676daefde11 100644
--- a/src/com/octetstring/jdbcLdap/jndi/Delete.java
+++ b/src/com/octetstring/jdbcLdap/jndi/Delete.java
@@ -54,9 +54,9 @@ public class Delete {
else {
try {
- LDAPSearchResults enum = res.searchUpInsJldap(del);
- while (enum.hasMore()) {
- LDAPEntry entry = enum.next();
+ LDAPSearchResults entries = res.searchUpInsJldap(del);
+ while (entries.hasMore()) {
+ LDAPEntry entry = entries.next();
con.delete(entry.getDN());
count++;
}
diff --git a/src/com/octetstring/jdbcLdap/jndi/Update.java b/src/com/octetstring/jdbcLdap/jndi/Update.java
index 29980d9c36990d0fbe9667e5c61677677d376c94..1fb51398fbf36f621dda9aeff513c92dd348b5eb 100644
--- a/src/com/octetstring/jdbcLdap/jndi/Update.java
+++ b/src/com/octetstring/jdbcLdap/jndi/Update.java
@@ -53,10 +53,10 @@ public class Update {
try {
if (update.getSearchScope() != 0) {
- LDAPSearchResults enum = res.searchUpInsJldap(update);
- //System.out.println("enum.hasMore : " + enum.hasMore());
- while (enum.hasMore()) {
- seres = enum.next();
+ LDAPSearchResults entries = res.searchUpInsJldap(update);
+ //System.out.println("entries.hasMore : " + entries.hasMore());
+ while (entries.hasMore()) {
+ seres = entries.next();
buf.setLength(0);
name = seres.getDN();
diff --git a/src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java b/src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java
index 8c72a4cae20c75432034dde60ebcfb750cc1c724..08947fcc1692c30c5085dc33cebfa2d7915301c8 100644
--- a/src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java
+++ b/src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java
@@ -112,9 +112,9 @@ public class UpdateEntry {
try {
int count = 0;
if (stmt.getSearchScope() != 0) {
- LDAPSearchResults enum = res.searchUpInsJldap(stmt);
- while (enum.hasMore()) {
- entry = enum.next();
+ LDAPSearchResults entries = res.searchUpInsJldap(stmt);
+ while (entries.hasMore()) {
+ entry = entries.next();
buf.setLength(0);
name = entry.getDN();
diff --git a/src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java b/src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java
index 57bb1da3d60da156bf4780c2325f977fe7897c11..cab433f741a183a3b2d87462b813c93b4791ec49 100644
--- a/src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java
+++ b/src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java
@@ -65,10 +65,10 @@ public class TestResultSet extends junit.framework.TestCase {
String field;
- LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+ LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
UnpackResults pack = new UnpackResults(con);
- pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap());
+ pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap());
LdapResultSet rs = new LdapResultSet(con,null,pack,sel.getBaseContext());
@@ -135,10 +135,10 @@ public class TestResultSet extends junit.framework.TestCase {
String field;
StringBuffer buf = new StringBuffer();
- LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+ LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
UnpackResults pack = new UnpackResults(con);
- pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap());
+ pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap());
LdapResultSet rs = new LdapResultSet(con,null,pack,sel.getBaseContext());
diff --git a/src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java b/src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java
index 1b26e2eb9ee47aacb79ded0b11a79aa685bcb156..73652eb261f0a571ff89f3043a6fe8942586cb73 100644
--- a/src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java
+++ b/src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java
@@ -213,9 +213,9 @@ public class TestSelectRetrieve extends junit.framework.TestCase {
/**
*Loads a NamingEnumeration into a LinkedList
- *@param enum Search Results
+ *@param naming Search Results
*/
- LinkedList load(NamingEnumeration enum) throws Exception {
+ LinkedList load(NamingEnumeration naming) throws Exception {
LinkedList list = new LinkedList();
LinkedList row;
SearchResult res;
@@ -227,9 +227,9 @@ public class TestSelectRetrieve extends junit.framework.TestCase {
String val;
Object obj;
- while (enum.hasMore()) {
+ while (naming.hasMore()) {
row = new LinkedList();
- res = (SearchResult) enum.next();
+ res = (SearchResult) naming.next();
//System.out.println(res.getName());
atts = (Attributes) res.getAttributes();
diff --git a/src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java b/src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java
index b842a4aca7f71685981d5efbbe44d833adac335a..6a3a364f505493fc85ee4b25275debe315462d40 100644
--- a/src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java
+++ b/src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java
@@ -67,10 +67,10 @@ public class TestUnpack extends junit.framework.TestCase {
- LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+ LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
UnpackResults pack = new UnpackResults(con);
- pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+ pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
ArrayList fieldsExp = new ArrayList();
@@ -186,12 +186,12 @@ public class TestUnpack extends junit.framework.TestCase {
String field;
- LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+ LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
- System.out.println(enum);
+ System.out.println(queue);
UnpackResults pack = new UnpackResults(con);
- pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+ pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
ArrayList fieldsExp = new ArrayList();
@@ -263,10 +263,10 @@ public class TestUnpack extends junit.framework.TestCase {
String field;
- LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+ LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
UnpackResults pack = new UnpackResults(con);
- pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+ pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
ArrayList fieldsExp = new ArrayList();
@@ -356,10 +356,10 @@ public class TestUnpack extends junit.framework.TestCase {
String field;
- LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+ LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
UnpackResults pack = new UnpackResults(con);
- pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+ pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
ArrayList fieldsExp = new ArrayList();
@@ -470,11 +470,11 @@ public class TestUnpack extends junit.framework.TestCase {
sel.getArgs()[0] = "Peons";
sel.getArgs()[1] = "A*";
- LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
- //if (! enum.hasMore()) System.out.println("no results");
+ LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
+ //if (! queue.hasMore()) System.out.println("no results");
UnpackResults pack = new UnpackResults(con);
- pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+ pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
ArrayList fieldsExp = new ArrayList();