1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
index a0ba7e8..42834c1 100644
--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
+++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
numRead);
- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
+ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
- _changeTypes = enum.getValue();
+ _changeTypes = enumx.getValue();
if (s.size() > 1) {
if (s.elementAt(1) instanceof BEROctetString) {
diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
index c73bb68..5539f11 100644
--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
+++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
numRead);
- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
+ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
- con.setChangeType(enum.getValue());
+ con.setChangeType(enumx.getValue());
if (s.size() > 1) {
if (s.elementAt(1) instanceof BEROctetString) {
diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
index e126d47..b5f6809 100644
--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
+++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
* @see org.ietf.ldap.util.RDN#getAttributeSyntax
*/
public static String[] getAttributesForSyntax( String oid ) {
- Enumeration enum = m_attributehash.keys();
+ Enumeration enumx = m_attributehash.keys();
Vector key_v = new Vector();
String tmp_str = null;
- while ( enum.hasMoreElements() ) {
- tmp_str = (String)enum.nextElement();
+ while ( enumx.hasMoreElements() ) {
+ tmp_str = (String)enumx.nextElement();
if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
key_v.addElement( tmp_str );
}
diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
index a4d9e88..85cc7af 100644
--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
@@ -4519,9 +4519,9 @@ public class LDAPConnection
LDAPControl[] controls = null;
synchronized(m_responseControlTable) {
- Enumeration enum = m_responseControlTable.keys();
- while (enum.hasMoreElements()) {
- Object client = enum.nextElement();
+ Enumeration enumx = m_responseControlTable.keys();
+ while (enumx.hasMoreElements()) {
+ Object client = enumx.nextElement();
ResponseControls rspCtrls = (ResponseControls)m_responseControlTable.get(client);
if (msgID == rspCtrls.msgID) {
diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
index 8e486c5..9256aa0 100644
--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
numRead);
- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
+ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
- m_changeTypes = enum.getValue();
+ m_changeTypes = enumx.getValue();
if (s.size() > 1) {
if (s.elementAt(1) instanceof BEROctetString) {
diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
index 9bab06a..a5836e8 100644
--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
numRead);
- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
+ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
- con.setChangeType(enum.getValue());
+ con.setChangeType(enumx.getValue());
if (s.size() > 1) {
if (s.elementAt(1) instanceof BEROctetString) {
diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
index 57bce3a..392d7ea 100644
--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
* @see netscape.ldap.util.RDN#getAttributeSyntax
*/
public static String[] getAttributesForSyntax( String oid ) {
- Enumeration enum = m_attributehash.keys();
+ Enumeration enumx = m_attributehash.keys();
Vector key_v = new Vector();
String tmp_str = null;
- while ( enum.hasMoreElements() ) {
- tmp_str = (String)enum.nextElement();
+ while ( enumx.hasMoreElements() ) {
+ tmp_str = (String)enumx.nextElement();
if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
key_v.addElement( tmp_str );
}
diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
index 4bcb46d..7b22371 100644
--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
+++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
@@ -151,8 +151,8 @@ class AttributesImpl implements Attributes {
*/
static LDAPAttributeSet jndiAttrsToLdapAttrSet(Attributes jndiAttrs) throws NamingException{
LDAPAttributeSet attrs = new LDAPAttributeSet();
- for (Enumeration enum = jndiAttrs.getAll(); enum.hasMoreElements();) {
- attrs.add(jndiAttrToLdapAttr((Attribute) enum.nextElement()));
+ for (Enumeration enumx = jndiAttrs.getAll(); enumx.hasMoreElements();) {
+ attrs.add(jndiAttrToLdapAttr((Attribute) enumx.nextElement()));
}
return attrs;
}
diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
index 2595b8a..d9bd103 100644
--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
+++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
@@ -465,8 +465,8 @@ public class ObjectMapper {
*/
static Attributes encodeDirCtxObj(DirContext obj, Attributes attrs) throws NamingException{
Attributes ctxAttrs = obj.getAttributes("");
- for (NamingEnumeration enum = ctxAttrs.getAll(); enum.hasMore();) {
- attrs.put((Attribute)enum.next());
+ for (NamingEnumeration enumx = ctxAttrs.getAll(); enumx.hasMore();) {
+ attrs.put((Attribute)enumx.next());
}
return attrs;
}
|
