You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2003/10/21 12:56:22 UTC

cvs commit: cocoon-2.1/src/blocks/naming/java/org/apache/cocoon/transformation LDAPTransformer.java

joerg       2003/10/21 03:56:22

  Modified:    src/blocks/naming/java/org/apache/cocoon/transformation
                        LDAPTransformer.java
  Log:
  fixed string recoding directions (bug 23855, due to Yury Mikhienko)
  
  Revision  Changes    Path
  1.7       +7 -7      cocoon-2.1/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java
  
  Index: LDAPTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LDAPTransformer.java	20 Sep 2003 17:13:33 -0000	1.6
  +++ LDAPTransformer.java	21 Oct 2003 10:56:22 -0000	1.7
  @@ -1860,7 +1860,7 @@
                                                   newAttrValue = recodeToLDAPEncoding(newAttrValue);
   
                                                   mods[0] = new ModificationItem(DirContext.REPLACE_ATTRIBUTE,
  -                                                                               new BasicAttribute(attrID, new String(newAttrValue)));
  +                                                                               new BasicAttribute(attrID,newAttrValue));
   
                                                   // Perform the requested modifications on the named object
                                                   ctx.modifyAttributes(
  @@ -1918,7 +1918,7 @@
                                               newAttrValue = recodeToLDAPEncoding(newAttrValue);
   
                                               mods[0] = new ModificationItem(DirContext.REPLACE_ATTRIBUTE,
  -                                                                           new BasicAttribute(attrID, new String(newAttrValue)));
  +                                                                           new BasicAttribute(attrID, newAttrValue));
   
                                               // Perform the requested modifications on the named object
                                               ctx.modifyAttributes(searchbase, mods);
  @@ -2014,7 +2014,7 @@
                                                   // Specify the changes to make
                                                   ModificationItem[] mods = new ModificationItem[1];
   
  -                                                String attrValue = recodeFromLDAPEncoding((String)attrMap.get(attrID));
  +                                                String attrValue = recodeToLDAPEncoding((String)attrMap.get(attrID));
                                                   mods[0] = new ModificationItem(DirContext.REPLACE_ATTRIBUTE,
                                                                                  new BasicAttribute(attrID, attrValue));
                                                   // Perform the requested modifications on the named object
  @@ -2038,7 +2038,7 @@
                                               ModificationItem[] mods = new ModificationItem[1];
                                               for (int i = 0; i < attrList.length; i++) {
                                                   if (attrMap.containsKey(attrList[i])) {
  -                                                    String attrValue = recodeFromLDAPEncoding((String)attrMap.get(attrList[i]));
  +                                                    String attrValue = recodeToLDAPEncoding((String)attrMap.get(attrList[i]));
                                                       mods[0] = new ModificationItem(DirContext.ADD_ATTRIBUTE,
                                                                                      new BasicAttribute(attrList[i], attrValue));
                                                       // Perform the requested modifications on the named object
  @@ -2084,7 +2084,7 @@
                                               // Specify the changes to make
                                               ModificationItem[] mods = new ModificationItem[1];
   
  -                                            String attrValue = recodeFromLDAPEncoding((String)attrMap.get(attrID));
  +                                            String attrValue = recodeToLDAPEncoding((String)attrMap.get(attrID));
                                               mods[0] = new ModificationItem(DirContext.REPLACE_ATTRIBUTE,
                                                                              new BasicAttribute(attrID,  attrValue));
                                               // Perform the requested modifications on the named object
  @@ -2104,7 +2104,7 @@
                                           ModificationItem[] mods = new ModificationItem[1];
                                           for (int i = 0; i < attrList.length; i++) {
                                               if (attrMap.containsKey(attrList[i])) {
  -                                                String attrValue = recodeFromLDAPEncoding((String)attrMap.get(attrList[i]));
  +                                                String attrValue = recodeToLDAPEncoding((String)attrMap.get(attrList[i]));
                                                   mods[0] = new ModificationItem(DirContext.ADD_ATTRIBUTE,
                                                                                  new BasicAttribute(attrList[i], attrValue));
                                                   // Perform the requested modifications on the named object