cvs commit: jahia/src/java/org/jahia/services/usermanager JahiaGroupManagerLDAPProvider.java JahiaUserManagerLDAPProvider.java

[Thomas Draier]

tdraier     2005/03/10 11:52:57 CET

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/usermanager 
                                            JahiaGroupManagerLDAPProvider.java 
                                            JahiaUserManagerLDAPProvider.java 
  Log:
  added reconnection on "NoInitialContextException"
  
  Revision   Changes    Path
  1.16.4.14  +3 -0      
jahia/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java.diff?r1=1.16.4.13&r2=1.16.4.14&f=h
  1.32.4.16  +3 -0      
jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java.diff?r1=1.32.4.15&r2=1.32.4.16&f=h
  
  
  
  Index: JahiaGroupManagerLDAPProvider.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaGroupManagerLDAPProvider.java,v
  retrieving revision 1.16.4.13
  retrieving revision 1.16.4.14
  diff -u -r1.16.4.13 -r1.16.4.14
  --- JahiaGroupManagerLDAPProvider.java        8 Mar 2005 13:30:20 -0000       
1.16.4.13
  +++ JahiaGroupManagerLDAPProvider.java        10 Mar 2005 10:52:56 -0000      
1.16.4.14
  @@ -971,6 +971,9 @@
                       ldapProperties.getProperty (SEARCH_NAME_PROP),
                       filterString.toString (),
                       searchCtl);
  +        } catch (javax.naming.NoInitialContextException nice) {
  +            logger.warn("Reconnection required", nice);
  +            return getGroups(getPublicContext(true), filters);
           } catch (javax.naming.CannotProceedException cpe) {
               logger.warn("Reconnection required", cpe);
               return getGroups(getPublicContext(true), filters);
  
  
  
  Index: JahiaUserManagerLDAPProvider.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaUserManagerLDAPProvider.java,v
  retrieving revision 1.32.4.15
  retrieving revision 1.32.4.16
  diff -u -r1.32.4.15 -r1.32.4.16
  --- JahiaUserManagerLDAPProvider.java 8 Mar 2005 13:30:21 -0000       
1.32.4.15
  +++ JahiaUserManagerLDAPProvider.java 10 Mar 2005 10:52:56 -0000      
1.32.4.16
  @@ -1515,6 +1515,9 @@
                       searchBase,
                       filterString.toString (),
                       searchCtl);
  +        } catch (javax.naming.NoInitialContextException nice) {
  +            logger.warn("Reconnection required", nice);
  +            return getUsers(getPublicContext(true), filterString, 
searchBase, scope);
           } catch (javax.naming.CannotProceedException cpe) {
               logger.warn("Reconnection required", cpe);
               return getUsers(getPublicContext(true), filterString, 
searchBase, scope);