svn commit: r481815 - /jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java

2006-12-03 Thread sebb 
Author: sebb
Date: Sun Dec  3 09:09:09 2006
New Revision: 481815

URL: http://svn.apache.org/viewvc?view=rev&rev=481815
Log:
HTTP version (httpclient.version) defaults to 1.1

Modified:

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?view=diff&rev=481815&r1=481814&r2=481815
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
 Sun Dec  3 09:09:09 2006
@@ -195,7 +195,8 @@
 }
 
 // Handle old-style JMeter properties
-String ver=JMeterUtils.getProperty("httpclient.version"); // 
$NON-NLS-1$
+// Default to HTTP version 1.1
+String ver=JMeterUtils.getPropDefault("httpclient.version","1.1"); // 
$NON-NLS-1$ $NON-NLS-2$
 try {
 params.setParameter(HttpMethodParams.PROTOCOL_VERSION, 
HttpVersion.parse("HTTP/"+ver));
 } catch (ProtocolException e) {



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

svn commit: r481816 - /jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java

2006-12-03 Thread sebb 
Author: sebb
Date: Sun Dec  3 09:10:18 2006
New Revision: 481816

URL: http://svn.apache.org/viewvc?view=rev&rev=481816
Log:
Ensure compiler.done() is called even for null samples

Modified:

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java?view=diff&rev=481816&r1=481815&r2=481816
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java
 Sun Dec  3 09:10:18 2006
@@ -260,7 +260,9 @@
if (result.isStopTest() 
|| (!result.isSuccessful() && onErrorStopTest)) {
stopTest();
}
-   }
+   } else {
+compiler.done(pack); // Finish up
+}
if (scheduler) {
// checks the scheduler 
to stop the iteration
stopScheduler();



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

svn commit: r481821 - /jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java

2006-12-03 Thread sebb 
Author: sebb
Date: Sun Dec  3 09:16:34 2006
New Revision: 481821

URL: http://svn.apache.org/viewvc?view=rev&rev=481821
Log:
Fixup version check

Modified:

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java?view=diff&rev=481821&r1=481820&r2=481821
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
 Sun Dec  3 09:16:34 2006
@@ -287,7 +287,7 @@
checkVersion(IntegerPropertyConverter.class, "332820"); // 
$NON-NLS-1$
checkVersion(LongPropertyConverter.class, "332820"); // 
$NON-NLS-1$
checkVersion(MultiPropertyConverter.class, "332820"); // 
$NON-NLS-1$
-   checkVersion(SampleResultConverter.class, "409495"); // 
$NON-NLS-1$
+   checkVersion(SampleResultConverter.class, "466304"); // 
$NON-NLS-1$
 
 // Not built until later, so need to use this method:
 try {



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

svn commit: r481824 - /jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml

2006-12-03 Thread sebb 
Author: sebb
Date: Sun Dec  3 09:18:16 2006
New Revision: 481824

URL: http://svn.apache.org/viewvc?view=rev&rev=481824
Log: (empty)

Modified:
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml

Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=481824&r1=481823&r2=481824
==
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sun Dec  3 09:18:16 2006
@@ -52,6 +52,7 @@
 Bug 40773 - XML JTL not parsed correctly
 Bug 41029 - JMeter -t fails to close input JMX file
 Bug 40954 - Statistical mode in distributed testing shows wrong 
results
+Fix ClassCast Exception when using sampler that returns null, e..g 
TestAction
 
 
 Version 2.2



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

svn commit: r481868 - /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

2006-12-03 Thread sebb 
Author: sebb
Date: Sun Dec  3 11:54:36 2006
New Revision: 481868

URL: http://svn.apache.org/viewvc?view=rev&rev=481868
Log:
Don't ignore samples with zero-length data

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?view=diff&rev=481868&r1=481867&r2=481868
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 Sun Dec  3 11:54:36 2006
@@ -66,7 +66,7 @@
 JMeterContext jmctx = JMeterContextService.getContext();
 
 SampleResult prev = jmctx.getPreviousResult();
-   if (prev == null || prev.getResponseData().length == 0) {
+   if (prev == null) {
return;
}
 



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

svn commit: r481869 - in /jakarta/jmeter/branches/rel-2-2/xdocs: changes.xml usermanual/component_reference.xml

2006-12-03 Thread sebb 
Author: sebb
Date: Sun Dec  3 11:58:55 2006
New Revision: 481869

URL: http://svn.apache.org/viewvc?view=rev&rev=481869
Log:
BeanShell Post-Processor no longer ignores samples with zero-length result data

Modified:
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=481869&r1=481868&r2=481869
==
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sun Dec  3 11:58:55 2006
@@ -36,6 +36,7 @@
 Added beanshell.init.file property to run a BeanShell script at 
startup
 Added timeout for WebService (SOAP) Sampler
 Bug 40804 - Change Counter default to max = Long.MAX_VALUE
+BeanShell Post-Processor no longer ignores samples with zero-length result 
data
 
 
 Bug fixes:

Modified: 
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml?view=diff&rev=481869&r1=481868&r2=481869
==
--- jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml 
(original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml 
Sun Dec  3 11:58:55 2006
@@ -2814,6 +2814,7 @@
 
 The BeanShell PreProcessor allows arbitrary code to be applied before taking a 
sample.
 
+Since version 2.2.1, the BeanShell Post-Processor no longer ignores samples 
with zero-length result data
 
 
 Descriptive name for this element 
that is shown in the tree.



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

svn commit: r481871 - /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

2006-12-03 Thread sebb 
Author: sebb
Date: Sun Dec  3 12:02:45 2006
New Revision: 481871

URL: http://svn.apache.org/viewvc?view=rev&rev=481871
Log:
Better behaviour when BeanShell jar is missing

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?view=diff&rev=481871&r1=481870&r2=481871
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 Sun Dec  3 12:02:45 2006
@@ -53,7 +53,7 @@
try {
bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
} catch (ClassNotFoundException e) {
-   log.error(e.getLocalizedMessage());
+   log.error("Cannot find BeanShell: 
"+e.getLocalizedMessage());
}
}
 
@@ -66,7 +66,7 @@
 JMeterContext jmctx = JMeterContextService.getContext();
 
 SampleResult prev = jmctx.getPreviousResult();
-   if (prev == null) {
+   if (prev == null || bshInterpreter == null) {
return;
}
 



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

svn commit: r481872 - in /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter: extractor/BeanShellPostProcessor.java modifiers/BeanShellPreProcessor.java

2006-12-03 Thread sebb 
Author: sebb
Date: Sun Dec  3 12:05:14 2006
New Revision: 481872

URL: http://svn.apache.org/viewvc?view=rev&rev=481872
Log:
Better behaviour when BeanShell jar is missing
Update serialVerId

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?view=diff&rev=481872&r1=481871&r2=481872
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 Sun Dec  3 12:05:14 2006
@@ -35,7 +35,7 @@
 public class BeanShellPostProcessor extends AbstractTestElement implements 
PostProcessor, Serializable, TestBean {
 private static final Logger log = LoggingManager.getLoggerForClass();
 
-private static final long serialVersionUID = 2;
+private static final long serialVersionUID = 3;
 
 private String script;
 

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java?view=diff&rev=481872&r1=481871&r2=481872
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 Sun Dec  3 12:05:14 2006
@@ -36,7 +36,7 @@
 public class BeanShellPreProcessor extends AbstractTestElement implements 
PreProcessor, Serializable, TestBean {
 private static final Logger log = LoggingManager.getLoggerForClass();
 
-private static final long serialVersionUID = 2;
+private static final long serialVersionUID = 3;
 
 private String script;
 
@@ -54,7 +54,7 @@
try {
bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
} catch (ClassNotFoundException e) {
-   log.error(e.getLocalizedMessage());
+   log.error("Cannot find BeanShell: 
"+e.getLocalizedMessage());
}
}
 
@@ -64,6 +64,9 @@
 }
 
 public void process(){
+if (bshInterpreter == null) {
+return;
+}
 JMeterContext jmctx = JMeterContextService.getContext();
 JMeterVariables vars = jmctx.getVariables();
Sampler sam = jmctx.getCurrentSampler();



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

DO NOT REPLY [Bug 41100] New: - Too many open files exception when usign HTTP Put with file input

2006-12-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=41100

   Summary: Too many open files exception when usign HTTP Put with
file input
   Product: JMeter
   Version: 2.2.1
  Platform: All
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Main
AssignedTo: jmeter-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


HTTPSampler2.setPutHeaders() uses a InputStreamRequestEntity that doesn't
automatically closes the FileInputStream. Becauses it open a new file descriptor
each time it quickly runs out of fds throwing a IOException:Too many open files.
One possible solution is to explore http-client-3.1 and its FileRequestEntity.
Other (quicker) solutions is to use read all the file contents in  a byte array
then close the file and use ByteArrayRequestEntity. I'm providing a patch that
does exactly that.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 41100] - Too many open files exception when usign HTTP Put with file input

2006-12-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=41100





--- Additional Comments From [EMAIL PROTECTED]  2006-12-03 22:27 ---
Created an attachment (id=19214)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=19214&action=view)
bug fix. that don't leave open files


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

Graham Little is out of the office.

2006-12-03 Thread Graham_Little 

I will be out of the office starting  04/12/2006 and will not return until
11/12/2006.

I will respond to your message when I return.


**
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
[EMAIL PROTECTED]

This footnote also confirms that this email message has been checked
for all known viruses.

**
Sony Computer Entertainment Europe


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

Bug report for JMeter [2006/12/03]

2006-12-03 Thread bugzilla 
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|11536|Ass|Enh|2002-08-07|Graph Results's throughput calculation includes id|
|15468|New|Enh|2002-12-18|Variable expansion in posted files in HTTPSampler |
|15999|New|Enh|2003-01-12|Show Results Tree is too HTTP-centric |
|16370|New|Enh|2003-01-23|HTTP Request log  |
|16886|New|Enh|2003-02-07|Recorded requests shouldn't duplicate info in HTTP|
|17248|New|Enh|2003-02-20|Graph Improvements|
|17252|Ass|Enh|2003-02-20|HTML Link Parser seems not work properly. |
|19128|Ass|Enh|2003-04-17|need to support multi files upload.   |
|21695|New|Enh|2003-07-17|Unix jmeter start script assumes it is on PATH, no|
|22076|New|Enh|2003-08-01|would like to be able to delete all server/ip and |
|5|Unc|Maj|2003-08-07|non GUI mode: unable to load a custom property fil|
|22510|New|Maj|2003-08-18|SSL Manager does not handle multiple client certif|
|23352|New|Enh|2003-09-23|Implement connection pool or LDAP transaction |
|24480|New|Enh|2003-11-06|There is no good way to set checkbox based items u|
|24684|New|Min|2003-11-13|remote debugging problems if spaces in the path of|
|25144|New|Enh|2003-12-02|Have the Restart button in the HTTP Proxy show up |
|25209|New|Min|2003-12-04|missed refresh of horizontal scrollbar when switch|
|25430|New|Enh|2003-12-11|Recording Controller to populate HTTP Authorisatio|
|25441|New|Nor|2003-12-11|TestPlan changes sometimes detected incorrectly (i|
|25753|Ass|Enh|2003-12-25|Charset encoding of form request parameter|
|25754|New|Nor|2003-12-25|Shift_JIS Response Data is corrupted in View Resul|
|27112|New|Enh|2004-02-20|User Parameters should use scrollbars |
|27481|New|Enh|2004-03-05|Allow some parameters to be passed to remote serve|
|27780|New|Enh|2004-03-18|create multipart/form-data HTTP request without up|
|27895|New|Enh|2004-03-24|badly formatted JDBC output (a regression w.r.t. 1|
|28028|New|Nor|2004-03-29|NON-GUI mode (distributed testing): IndexOutOfBoun|
|28502|New|Enh|2004-04-20|HTTP Resource Cache   |
|28715|New|Nor|2004-04-30|User Parameters do not work in HTTP Cookie Manager|
|28767|New|Maj|2004-05-04|Problems with german umlauts by using jmeters http|
|28866|New|Nor|2004-05-10|Line terminators converted into spaces.   |
|29179|New|Nor|2004-05-24|HTTP proxy can no longer record non-ascii characte|
|29331|New|Enh|2004-06-01|how to load test java applet using JMeter |
|29352|New|Enh|2004-06-03|Memory leak in Distributed testing|
|29603|New|Enh|2004-06-16|Custom component developers need own resource bund|
|29708|New|Enh|2004-06-21|startup delay by JMeterThread initialization  |
|30120|New|Min|2004-07-15|Name of simple controller is resetted if a new sim|
|30157|New|Enh|2004-07-16|It would be nice when running distributed tests th|
|30377|Inf|Nor|2004-07-29|NPE in remote testing (see also 23487)|
|30411|New|Enh|2004-07-30|Add Follow Redirects box to HTTP Proxy Server |
|30550|New|Enh|2004-08-09|Confirm Closing of JMeter |
|30563|New|Enh|2004-08-10|Thread Group should have a restart loop option on |
|30823|New|Maj|2004-08-24|Encoded characters as form field values   |
|30945|New|Enh|2004-08-30|Remote Exit does not shut down the rmi registry.  |
|31336|New|Enh|2004-09-21|Opening recent project file does not work when clo|
|31666|New|Enh|2004-10-12|writing sampleresults to databases|
|31792|New|Enh|2004-10-20|reuse of http connections |
|31832|New|Nor|2004-10-21|HTTPS seems to randomly lock during handshake |
|32184|New|Enh|2004-11-11|Wanted: preset patterns to include/exclude|
|32494|New|Enh|2004-12-02|Enhancement - scheduler should be added to Test Pl|
|33305|New|Enh|2005-01-31|Visual diff and merge functionality for JMeter scr|
|33435|New|Nor|2005-02-07|Parameters not encoded on multipart/form posts|
|33878|