jmeter-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Antonio Gomes Rodrigues <ra0...@gmail.com>
Subject Re: [GitHub] jmeter pull request: bug59153_ExceptionInCSVDataSetWithEmptyFilena...
Date Tue, 15 Mar 2016 08:09:48 GMT
Hi,

I don't have modify these lines.

But I think that CSV Data Set need more work to be ok

Antonio

2016-03-15 9:06 GMT+01:00 vlsi <git@git.apache.org>:

> Github user vlsi commented on a diff in the pull request:
>
>     https://github.com/apache/jmeter/pull/162#discussion_r56126557
>
>     --- Diff: src/components/org/apache/jmeter/config/CSVDataSet.java ---
>     @@ -146,71 +146,76 @@ public void setProperty(JMeterProperty property)
> {
>
>          @Override
>          public void iterationStart(LoopIterationEvent iterEvent) {
>     -        FileServer server = FileServer.getFileServer();
>     -        final JMeterContext context = getThreadContext();
>     -        String delim = getDelimiter();
>     -        if (delim.equals("\\t")) { // $NON-NLS-1$
>     -            delim = "\t";// Make it easier to enter a Tab //
> $NON-NLS-1$
>     -        } else if (delim.length()==0){
>     -            log.warn("Empty delimiter converted to ','");
>     -            delim=",";
>     -        }
>     -        if (vars == null) {
>     -            String _fileName = getFilename();
>     -            String mode = getShareMode();
>     -            int modeInt = CSVDataSetBeanInfo.getShareModeAsInt(mode);
>     -            switch(modeInt){
>     -                case CSVDataSetBeanInfo.SHARE_ALL:
>     -                    alias = _fileName;
>     -                    break;
>     -                case CSVDataSetBeanInfo.SHARE_GROUP:
>     -                    alias =
> _fileName+"@"+System.identityHashCode(context.getThreadGroup());
>     -                    break;
>     -                case CSVDataSetBeanInfo.SHARE_THREAD:
>     -                    alias =
> _fileName+"@"+System.identityHashCode(context.getThread());
>     -                    break;
>     -                default:
>     -                    alias = _fileName+"@"+mode; // user-specified key
>     -                    break;
>     +        String _fileName = getFilename();
>     +        if (!_fileName.isEmpty()) {
>     +            FileServer server = FileServer.getFileServer();
>     +            final JMeterContext context = getThreadContext();
>     +            String delim = getDelimiter();
>     +            if (delim.equals("\\t")) { // $NON-NLS-1$
>     +                delim = "\t";// Make it easier to enter a Tab //
> $NON-NLS-1$
>     +            } else if (delim.length()==0){
>     +                log.warn("Empty delimiter converted to ','");
>     +                delim=",";
>                  }
>     -            final String names = getVariableNames();
>     -            if (names == null || names.length()==0) {
>     -                String header = server.reserveFile(_fileName,
> getFileEncoding(), alias, true);
>     -                try {
>     -                    vars = CSVSaveService.csvSplitString(header,
> delim.charAt(0));
>     -                    firstLineIsNames = true;
>     -                } catch (IOException e) {
>     -                    log.warn("Could not split CSV header line",e);
>     +            if (vars == null) {
>     +                String mode = getShareMode();
>     +                int modeInt =
> CSVDataSetBeanInfo.getShareModeAsInt(mode);
>     +                switch(modeInt){
>     +                    case CSVDataSetBeanInfo.SHARE_ALL:
>     +                        alias = _fileName;
>     +                        break;
>     +                    case CSVDataSetBeanInfo.SHARE_GROUP:
>     +                        alias =
> _fileName+"@"+System.identityHashCode(context.getThreadGroup());
>     +                        break;
>     +                    case CSVDataSetBeanInfo.SHARE_THREAD:
>     +                        alias =
> _fileName+"@"+System.identityHashCode(context.getThread());
>     --- End diff --
>
>     Same for `..identityHashCode(context.getThread...`
>
>
> ---
> If your project is set up for it, you can reply to this email and have your
> reply appear on GitHub as well. If your project does not have this feature
> enabled and wishes so, or if the feature is enabled but not working, please
> contact infrastructure at infrastructure@apache.org or file a JIRA ticket
> with INFRA.
> ---
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message