greenrd     00/10/22 05:28:18

  Modified:    .        changes.xml
               src/org/apache/cocoon/processor/ldap LdapProcessor.java
  Log:
  LDAP processor now accepts byte arrays
  
  Revision  Changes    Path
  1.131     +3 -0      xml-cocoon/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/changes.xml,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- changes.xml       2000/10/21 14:20:07     1.130
  +++ changes.xml       2000/10/22 12:28:18     1.131
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes   
  -  $Id: changes.xml,v 1.130 2000/10/21 14:20:07 greenrd Exp $ 
  +  $Id: changes.xml,v 1.131 2000/10/22 12:28:18 greenrd Exp $ 
   -->
   
   <changes title="History of Changes">
  @@ -17,6 +17,9 @@
     </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="RDG" type="fix" due-to="Jeff Turner" due-to-email="[EMAIL 
PROTECTED]">
  +   LDAP processor now accepts byte arrays without throwing a 
ClassCastException
  +  </action>
     <action dev="RDG" type="add" due-to="Mahe Vincent" 
      due-to-email="[EMAIL PROTECTED]">
      Added installation instructions for JRun 3.0
  
  
  
  1.3       +17 -2     
xml-cocoon/src/org/apache/cocoon/processor/ldap/LdapProcessor.java
  
  Index: LdapProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/processor/ldap/LdapProcessor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LdapProcessor.java        2000/02/13 18:29:31     1.2
  +++ LdapProcessor.java        2000/10/22 12:28:18     1.3
  @@ -1,4 +1,4 @@
  -/*-- $Id: LdapProcessor.java,v 1.2 2000/02/13 18:29:31 stefano Exp $ -- 
  +/*-- $Id: LdapProcessor.java,v 1.3 2000/10/22 12:28:18 greenrd Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -53,6 +53,7 @@
   
   import java.util.*;
   import java.io.*;
  +import java.lang.reflect.Array;
   import org.w3c.dom.*;
   import javax.servlet.http.*;
   import org.apache.cocoon.framework.*;
  @@ -167,7 +168,21 @@
                                                Enumeration vals = 
attr.getAll();
                                                while(vals.hasMoreElements()) {
                                                        Element attrElement = 
doc.createElement(attrId);
  -                                                     
attrElement.appendChild(doc.createTextNode((String)vals.nextElement()));
  +                                                     Object valObj = 
vals.nextElement ();
  +                                                     String valStr;
  +                                                     try {
  +                                                             valStr = 
(String)valObj;
  +                                                     }
  +                                                     catch 
(ClassCastException ex) {
  +                                                             // it's an array
  +                                                             int strSize = 
Array.getLength (valObj);
  +                                                             StringBuffer 
valBuf = new StringBuffer(strSize);
  +                                                             for (int i = 0; 
i < strSize; i++) {
  +                                                                     
valBuf.append (Array.get (valObj,i));
  +                                                             }
  +                                                             valStr = 
valBuf.toString ();
  +                                                     }
  +                                                     
attrElement.appendChild(doc.createTextNode(valStr));
                                                        
searchNode.appendChild(attrElement);
                                                                        
                                                }
  
  
  

Reply via email to