Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 271143 - Java SDK doesn't compile on Java 1.5. r=mcs@pearlcrescent.com, r=erhyuan@pacbell.net

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@165925 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rlk%trfenv.com
2004-11-30 01:45:19 +00:00
parent 514d687768
commit d6dd3ac250
9 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
View File

@@ -152,8 +152,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 itr = jndiAttrs.getAll(); itr.hasMoreElements();) {
attrs.add(jndiAttrToLdapAttr((Attribute) itr.nextElement()));
}
return attrs;
}
@@ -184,12 +184,12 @@ class AttributesImpl implements Attributes {
*/
static Attribute ldapAttrToJndiAttr(LDAPAttribute attr) {
BasicAttribute jndiAttr = new BasicAttribute(attr.getName());
Enumeration enumVals = null;
Enumeration itrVals = null;
if (isBinaryAttribute(attr.getName())) {
enumVals = attr.getByteValues();
itrVals = attr.getByteValues();
}
else {
enumVals = attr.getStringValues();
itrVals = attr.getStringValues();
}
/* Performance enhancement for an attribute with many values.
* If number of value over threshold, use TreeSet to quickly
@@ -197,9 +197,9 @@ class AttributesImpl implements Attributes {
* to pass TreeSet directly to Vector of JNDI attribute.
*/
if (attr.size() < 50 ) {
if (enumVals != null) {
while ( enumVals.hasMoreElements() ) {
jndiAttr.add(enumVals.nextElement());
if (itrVals != null) {
while ( itrVals.hasMoreElements() ) {
jndiAttr.add(itrVals.nextElement());
}
}
}
@@ -214,9 +214,9 @@ class AttributesImpl implements Attributes {
}
}
TreeSet valSet = new TreeSet();
if (enumVals != null) {
while ( enumVals.hasMoreElements() ) {
valSet.add(enumVals.nextElement());
if (itrVals != null) {
while ( itrVals.hasMoreElements() ) {
valSet.add(itrVals.nextElement());
}
}
jndiAttr = new BigAttribute(attr.getName(), valSet);

4
mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
View File

@@ -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 itr = ctxAttrs.getAll(); itr.hasMore();) {
attrs.put((Attribute)itr.next());
}
return attrs;
}