View | Details | Raw Unified | Return to bug 47556
Collapse All | Expand All

(-)src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java (-1 / +2 lines)
Lines 184-190 Link Here
184
        useNonPersistentDelivery.setSelected(sampler.isNonPersistent());
184
        useNonPersistentDelivery.setSelected(sampler.isNonPersistent());
185
        useReqMsgIdAsCorrelId.setSelected(sampler.isUseReqMsgIdAsCorrelId());
185
        useReqMsgIdAsCorrelId.setSelected(sampler.isUseReqMsgIdAsCorrelId());
186
        
186
        
187
        timeout.setText(String.valueOf(sampler.getTimeout()));
187
//        timeout.setText(String.valueOf(sampler.getTimeout()));
188
        timeout.setText(sampler.getTimeout());
188
        soapXml.setText(sampler.getContent());
189
        soapXml.setText(sampler.getContent());
189
        initialContextFactory.setText(sampler.getInitialContextFactory());
190
        initialContextFactory.setText(sampler.getInitialContextFactory());
190
        providerUrl.setText(sampler.getContextProvider());
191
        providerUrl.setText(sampler.getContextProvider());
(-)src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (-2 / +9 lines)
Lines 340-346 Link Here
340
                    if (isNonPersistent()) {
340
                    if (isNonPersistent()) {
341
                        producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
341
                        producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
342
                    }
342
                    }
343
                    executor = new FixedQueueExecutor(producer, getTimeout(), isUseReqMsgIdAsCorrelId());
343
                    executor = new FixedQueueExecutor(producer, getTimeoutAsInt(), isUseReqMsgIdAsCorrelId());
344
                }
344
                }
345
            }
345
            }
346
            if (LOGGER.isDebugEnabled()) {
346
            if (LOGGER.isDebugEnabled()) {
Lines 424-435 Link Here
424
        }
424
        }
425
    }
425
    }
426
426
427
    public int getTimeout() {
427
    private int getTimeoutAsInt() {
428
        if (getPropertyAsInt(TIMEOUT) < 1) {
428
        if (getPropertyAsInt(TIMEOUT) < 1) {
429
            return DEFAULT_TIMEOUT;
429
            return DEFAULT_TIMEOUT;
430
        }
430
        }
431
        return getPropertyAsInt(TIMEOUT);
431
        return getPropertyAsInt(TIMEOUT);
432
    }
432
    }
433
    
434
    public String getTimeout() {
435
        if (getPropertyAsString(TIMEOUT).equals("") ) {
436
            return ""+DEFAULT_TIMEOUT;
437
        }
438
        return getPropertyAsString(TIMEOUT);
439
    }
433
440
434
    /*
441
    /*
435
     * (non-Javadoc)
442
     * (non-Javadoc)

Return to bug 47556