jakarta-jmeter-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler LDAPExtSampler.java LdapExtClient.java
Date Sat, 02 Oct 2004 12:18:15 GMT
sebb        2004/10/02 05:18:14

  Modified:    src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler
                        LDAPExtSampler.java LdapExtClient.java
  Log:
  See bug 30952 - applied fixes, except changed log.error to log.debug
  
  Revision  Changes    Path
  1.2       +7 -1      jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
  
  Index: LDAPExtSampler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LDAPExtSampler.java	17 Aug 2004 23:15:37 -0000	1.1
  +++ LDAPExtSampler.java	2 Oct 2004 12:18:14 -0000	1.2
  @@ -761,6 +761,12 @@
                   responseData=responseData + "<comparedn>" +getPropertyAsString(COMPAREDN)
+"</comparedn>";
                   responseData=responseData + "<comparefilter>" +getPropertyAsString(COMPAREFILT)
+"</comparefilter></operation>";
                   compareOp(temp_client, dirContext, res);
  +			    if(temp_client.compareAnswer.hasMore()) {
  +			    } else {
  +           				res.setResponseCode("49")	;
  +           				res.setResponseMessage("compareFalse");
  +            			isSuccessful = false;
  +                }
               }else if (getPropertyAsString(TEST).equals("add")) {
                   res.setSamplerData("Add object "+getPropertyAsString(BASE_ENTRY_DN));
                   responseData=responseData + "<operation><opertype>add</opertype>";
  
  
  
  1.2       +5 -2      jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
  
  Index: LdapExtClient.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LdapExtClient.java	17 Aug 2004 23:15:37 -0000	1.1
  +++ LdapExtClient.java	2 Oct 2004 12:18:14 -0000	1.2
  @@ -58,6 +58,7 @@
       .getLoggerFor("jmeter.protocol.ldap");
      public final static String CONNECTOR = "ldap_con";
      public NamingEnumeration answer;
  +   public NamingEnumeration compareAnswer;
       /**
        *  Constructor for the LdapClient object
        */
  @@ -121,6 +122,7 @@
           throws Exception{
           SearchControls searchcontrols= null;
           searchcontrols = new SearchControls(scope, countlim, timelim, attrs, retobj, deref);

  +        log.debug("scope, countlim, timelim, attrs, retobj, deref= "+searchFilter+scope+
countlim+ timelim+ attrs+ retobj+ deref);
           answer=dirContext.search(searchBase, searchFilter, searchcontrols);
       }
   
  @@ -132,7 +134,7 @@
        ***********************************************************/
      public void compare(DirContext dirContext, String filter, String entrydn) throws Exception{
          SearchControls searchcontrols = new SearchControls(0, 1, 0, new String[0], false,
false); 
  -       dirContext.search(entrydn, filter, searchcontrols);
  +       compareAnswer=dirContext.search(entrydn, filter, searchcontrols);
       }
   
      /************************************************************
  @@ -142,6 +144,7 @@
        *@param  search filter filter this value from the base  
        ***********************************************************/
      public void moddnOp(DirContext dirContext, String ddn, String newdn) throws Exception{
  +       log.debug("ddn and newDn= "+ddn+"@@@@"+newdn);
          dirContext.rename(ddn, newdn);
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org


Mime
View raw message