sebb        2005/02/21 18:09:41

  Modified:    src/core/org/apache/jmeter Tag: rel-2_0 JMeter.java
  Log:
  Add extra logging of parameters
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.27.2.3  +14 -8     jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
  
  Index: JMeter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
  retrieving revision 1.27.2.2
  retrieving revision 1.27.2.3
  diff -u -r1.27.2.2 -r1.27.2.3
  --- JMeter.java       20 Feb 2005 23:53:28 -0000      1.27.2.2
  +++ JMeter.java       22 Feb 2005 02:09:41 -0000      1.27.2.3
  @@ -325,34 +325,40 @@
           {
               if (parser.getArgumentById(PROXY_PASSWORD) != null)
               {
  +                             String u,p;
                   Authenticator.setDefault(
                       new ProxyAuthenticator(
  -                        parser.getArgumentById(PROXY_USERNAME).getArgument(),
  -                        
parser.getArgumentById(PROXY_PASSWORD).getArgument()));
  +                        
u=parser.getArgumentById(PROXY_USERNAME).getArgument(),
  +                        
p=parser.getArgumentById(PROXY_PASSWORD).getArgument()));
  +                             log.info("Set Proxy login: "+u+"/"+p);
               }
               else
               {
  +                             String u;
                   Authenticator.setDefault(
                       new ProxyAuthenticator(
  -                        parser.getArgumentById(PROXY_USERNAME).getArgument(),
  +                        
u=parser.getArgumentById(PROXY_USERNAME).getArgument(),
                           ""));
  +                             log.info("Set Proxy login: "+u);
               }
           }
           if (parser.getArgumentById(PROXY_HOST) != null
               && parser.getArgumentById(PROXY_PORT) != null)
           {
  +                     String h,p;
               System.setProperty(
                   "http.proxyHost",
  -                parser.getArgumentById(PROXY_HOST).getArgument());
  +                h=parser.getArgumentById(PROXY_HOST).getArgument());
               System.setProperty(
                   "https.proxyHost",
                   parser.getArgumentById(PROXY_HOST).getArgument());
               System.setProperty(
                   "http.proxyPort",
  -                parser.getArgumentById(PROXY_PORT).getArgument());
  +                p=parser.getArgumentById(PROXY_PORT).getArgument());
               System.setProperty(
                   "https.proxyPort",
                   parser.getArgumentById(PROXY_PORT).getArgument());
  +                     log.info("Set http[s].proxyHost: "+h+" Port: "+p);
           }
           else if (
               parser.getArgumentById(PROXY_HOST) != null
  @@ -393,7 +399,7 @@
               String name = option.getArgument(0);
               String value = option.getArgument(1);
   
  -            switch (option.getId())
  +            switch (option.getDescriptor().getId())
               {
                   case SYSTEM_PROPERTY :
                       if (value.length() > 0)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to