Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Johann Schmitz (ercpe)" <ercpe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/ldapsdk/files: 4.1.7-fix-jdk-1.7-enum.patch
Date: Sat, 21 Jun 2014 06:58:36
Message-Id: 20140621065830.DEEEA2004E@flycatcher.gentoo.org
1 ercpe 14/06/21 06:58:30
2
3 Added: 4.1.7-fix-jdk-1.7-enum.patch
4 Log:
5 EAPI bump; fixed bug #513580 (renamed variables named "enum"), some QA
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
8
9 Revision Changes Path
10 1.1 dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch?rev=1.1&content-type=text/plain
14
15 Index: 4.1.7-fix-jdk-1.7-enum.patch
16 ===================================================================
17 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
18 index a0ba7e8..42834c1 100644
19 --- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
20 +++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
21 @@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
22 BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
23 numRead);
24
25 - BEREnumerated enum = (BEREnumerated)s.elementAt(0);
26 + BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
27
28 - _changeTypes = enum.getValue();
29 + _changeTypes = enumx.getValue();
30
31 if (s.size() > 1) {
32 if (s.elementAt(1) instanceof BEROctetString) {
33 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
34 index c73bb68..5539f11 100644
35 --- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
36 +++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
37 @@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
38 BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
39 numRead);
40
41 - BEREnumerated enum = (BEREnumerated)s.elementAt(0);
42 + BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
43
44 - con.setChangeType(enum.getValue());
45 + con.setChangeType(enumx.getValue());
46
47 if (s.size() > 1) {
48 if (s.elementAt(1) instanceof BEROctetString) {
49 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
50 index e126d47..b5f6809 100644
51 --- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
52 +++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
53 @@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
54 * @see org.ietf.ldap.util.RDN#getAttributeSyntax
55 */
56 public static String[] getAttributesForSyntax( String oid ) {
57 - Enumeration enum = m_attributehash.keys();
58 + Enumeration enumx = m_attributehash.keys();
59 Vector key_v = new Vector();
60 String tmp_str = null;
61
62 - while ( enum.hasMoreElements() ) {
63 - tmp_str = (String)enum.nextElement();
64 + while ( enumx.hasMoreElements() ) {
65 + tmp_str = (String)enumx.nextElement();
66 if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
67 key_v.addElement( tmp_str );
68 }
69 diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
70 index a4d9e88..85cc7af 100644
71 --- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
72 +++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
73 @@ -4519,9 +4519,9 @@ public class LDAPConnection
74 LDAPControl[] controls = null;
75
76 synchronized(m_responseControlTable) {
77 - Enumeration enum = m_responseControlTable.keys();
78 - while (enum.hasMoreElements()) {
79 - Object client = enum.nextElement();
80 + Enumeration enumx = m_responseControlTable.keys();
81 + while (enumx.hasMoreElements()) {
82 + Object client = enumx.nextElement();
83 ResponseControls rspCtrls = (ResponseControls)m_responseControlTable.get(client);
84
85 if (msgID == rspCtrls.msgID) {
86 diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
87 index 8e486c5..9256aa0 100644
88 --- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
89 +++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
90 @@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
91 BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
92 numRead);
93
94 - BEREnumerated enum = (BEREnumerated)s.elementAt(0);
95 + BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
96
97 - m_changeTypes = enum.getValue();
98 + m_changeTypes = enumx.getValue();
99
100 if (s.size() > 1) {
101 if (s.elementAt(1) instanceof BEROctetString) {
102 diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
103 index 9bab06a..a5836e8 100644
104 --- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
105 +++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
106 @@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
107 BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
108 numRead);
109
110 - BEREnumerated enum = (BEREnumerated)s.elementAt(0);
111 + BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
112
113 - con.setChangeType(enum.getValue());
114 + con.setChangeType(enumx.getValue());
115
116 if (s.size() > 1) {
117 if (s.elementAt(1) instanceof BEROctetString) {
118 diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
119 index 57bce3a..392d7ea 100644
120 --- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
121 +++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
122 @@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
123 * @see netscape.ldap.util.RDN#getAttributeSyntax
124 */
125 public static String[] getAttributesForSyntax( String oid ) {
126 - Enumeration enum = m_attributehash.keys();
127 + Enumeration enumx = m_attributehash.keys();
128 Vector key_v = new Vector();
129 String tmp_str = null;
130
131 - while ( enum.hasMoreElements() ) {
132 - tmp_str = (String)enum.nextElement();
133 + while ( enumx.hasMoreElements() ) {
134 + tmp_str = (String)enumx.nextElement();
135 if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
136 key_v.addElement( tmp_str );
137 }
138 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
139 index 4bcb46d..7b22371 100644
140 --- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
141 +++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
142 @@ -151,8 +151,8 @@ class AttributesImpl implements Attributes {
143 */
144 static LDAPAttributeSet jndiAttrsToLdapAttrSet(Attributes jndiAttrs) throws NamingException{
145 LDAPAttributeSet attrs = new LDAPAttributeSet();
146 - for (Enumeration enum = jndiAttrs.getAll(); enum.hasMoreElements();) {
147 - attrs.add(jndiAttrToLdapAttr((Attribute) enum.nextElement()));
148 + for (Enumeration enumx = jndiAttrs.getAll(); enumx.hasMoreElements();) {
149 + attrs.add(jndiAttrToLdapAttr((Attribute) enumx.nextElement()));
150 }
151 return attrs;
152 }
153 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
154 index 2595b8a..d9bd103 100644
155 --- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
156 +++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
157 @@ -465,8 +465,8 @@ public class ObjectMapper {
158 */
159 static Attributes encodeDirCtxObj(DirContext obj, Attributes attrs) throws NamingException{
160 Attributes ctxAttrs = obj.getAttributes("");
161 - for (NamingEnumeration enum = ctxAttrs.getAll(); enum.hasMore();) {
162 - attrs.put((Attribute)enum.next());
163 + for (NamingEnumeration enumx = ctxAttrs.getAll(); enumx.hasMore();) {
164 + attrs.put((Attribute)enumx.next());
165 }
166 return attrs;
167 }
Report Message
Find on MARC Find on Google Groups