You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jb...@apache.org on 2006/02/23 15:47:23 UTC
svn commit: r380133 - in
/cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming:
EntryManager.java LDAPEntryManager.java
Author: jbq
Date: Thu Feb 23 06:47:20 2006
New Revision: 380133
URL: http://svn.apache.org/viewcvs?rev=380133&view=rev
Log:
Keep in sync with trunk
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/EntryManager.java
cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/LDAPEntryManager.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/EntryManager.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/EntryManager.java?rev=380133&r1=380132&r2=380133&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/EntryManager.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/EntryManager.java Thu Feb 23 06:47:20 2006
@@ -16,9 +16,10 @@
*/
package org.apache.cocoon.components.naming;
-import org.apache.avalon.framework.component.*;
-import javax.naming.directory.*;
import java.util.Map;
+
+import javax.naming.directory.DirContext;
+
import org.apache.cocoon.ProcessingException;
@@ -28,9 +29,10 @@
* @author Jeremy Quinn <a href="http://apache.org/~jeremy">http://apache.org/~jeremy</a>.
*/
-public interface EntryManager extends Component {
- String ROLE = EntryManager.class.getName();
- int ADD_ATTRIBUTE = DirContext.ADD_ATTRIBUTE;
+public interface EntryManager {
+ String ROLE = EntryManager.class.getName();
+
+ int ADD_ATTRIBUTE = DirContext.ADD_ATTRIBUTE;
int REMOVE_ATTRIBUTE = DirContext.REMOVE_ATTRIBUTE;
int REPLACE_ATTRIBUTE = DirContext.REPLACE_ATTRIBUTE;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/LDAPEntryManager.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/LDAPEntryManager.java?rev=380133&r1=380132&r2=380133&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/LDAPEntryManager.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/components/naming/LDAPEntryManager.java Thu Feb 23 06:47:20 2006
@@ -70,7 +70,6 @@
/* internal state */
private boolean disposed = false;
- private boolean recycled = false;
/* internal instance variables */
protected DirContext context = null;
@@ -125,7 +124,6 @@
} finally {
this.context = null;
}
- this.recycled = true;
}
/* Avalon, Dispose of this Class */
@@ -290,14 +288,15 @@
*/
private Attributes map2Attributes (Map map) {
Attributes attrs = new BasicAttributes (false);
- for (Iterator i = map.entrySet().iterator(); i.hasNext(); ) {
- Map.Entry me = (Map.Entry)i.next();
- String key = (String)me.getKey();
- Attribute attr = new BasicAttribute(key);
- for (Iterator vals = ((List)me.getValue()).iterator(); vals.hasNext(); ) {
- attr.add(vals.next());
+ Iterator keys = map.keySet ().iterator ();
+ while (keys.hasNext ()) {
+ String key = (String)keys.next ();
+ Iterator vals = ((List)map.get (key)).iterator ();
+ Attribute attr = new BasicAttribute (key);
+ while (vals.hasNext ()) {
+ attr.add (vals.next ());
}
- attrs.put(attr);
+ attrs.put (attr);
}
return attrs;
}