Author: sebb
Date: Tue Sep 29 16:39:19 2009
New Revision: 820025
URL: http://svn.apache.org/viewvc?rev=820025&view=rev
Log:
Tab police
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java
jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java
jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java
jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Tue Sep 29
16:39:19 2009
@@ -750,10 +750,10 @@
tree.add(tree.getArray()[0], logger);
}
else {
- // only add Summariser if it can not be shared with the
ResultCollector
- if (summer != null) {
- tree.add(tree.getArray()[0], summer);
- }
+ // only add Summariser if it can not be shared with the
ResultCollector
+ if (summer != null) {
+ tree.add(tree.getArray()[0], summer);
+ }
}
List<JMeterEngine> engines = new LinkedList<JMeterEngine>();
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Tue Sep 29 16:39:19 2009
@@ -505,7 +505,7 @@
}
if(summariser != null) {
- summariser.sampleOccurred(event);
+ summariser.sampleOccurred(event);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
Tue Sep 29 16:39:19 2009
@@ -32,15 +32,15 @@
*
*/
public class DataStrippingSampleSender implements SampleSender, Serializable {
- private static final long serialVersionUID = 1;
- private static final Logger log = LoggingManager.getLoggerForClass();
-
- private final RemoteSampleListener listener;
- private final SampleSender decoratedSender;
-
- /**
- * @deprecated only for use by test code
- */
+ private static final long serialVersionUID = 1;
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ private final RemoteSampleListener listener;
+ private final SampleSender decoratedSender;
+
+ /**
+ * @deprecated only for use by test code
+ */
@Deprecated
public DataStrippingSampleSender(){
log.warn("Constructor only intended for use in testing"); //
$NON-NLS-1$
@@ -48,43 +48,43 @@
decoratedSender = null;
}
- DataStrippingSampleSender(RemoteSampleListener listener) {
- this.listener = listener;
- decoratedSender = null;
- }
-
- DataStrippingSampleSender(SampleSender decorate)
- {
- this.decoratedSender = decorate;
+ DataStrippingSampleSender(RemoteSampleListener listener) {
+ this.listener = listener;
+ decoratedSender = null;
+ }
+
+ DataStrippingSampleSender(SampleSender decorate)
+ {
+ this.decoratedSender = decorate;
this.listener = null;
- }
+ }
+
+ public void testEnded() {
+ if(decoratedSender != null) decoratedSender.testEnded();
+ }
+
+ public void testEnded(String host) {
+ if(decoratedSender != null) decoratedSender.testEnded(host);
+ }
- public void testEnded() {
- if(decoratedSender != null) decoratedSender.testEnded();
- }
-
- public void testEnded(String host) {
- if(decoratedSender != null) decoratedSender.testEnded(host);
- }
-
- public void sampleOccurred(SampleEvent event) {
- //Strip the response data before writing, but only for a
successful request.
- SampleResult result = event.getResult();
- if(result.isSuccessful()) {
- result.setResponseData(new byte[0]);
- }
- if(decoratedSender == null)
- {
- try {
- listener.sampleOccurred(event);
- } catch (RemoteException e) {
- log.error("Error sending sample result over
network ",e);
- }
- }
- else
- {
- decoratedSender.sampleOccurred(event);
- }
- }
+ public void sampleOccurred(SampleEvent event) {
+ //Strip the response data before writing, but only for a successful
request.
+ SampleResult result = event.getResult();
+ if(result.isSuccessful()) {
+ result.setResponseData(new byte[0]);
+ }
+ if(decoratedSender == null)
+ {
+ try {
+ listener.sampleOccurred(event);
+ } catch (RemoteException e) {
+ log.error("Error sending sample result over network ",e);
+ }
+ }
+ else
+ {
+ decoratedSender.sampleOccurred(event);
+ }
+ }
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Tue Sep 29 16:39:19 2009
@@ -1075,17 +1075,17 @@
}
// Bug 47394
- /**
- * Allow custom SampleSenders to drop unwanted assertionResults
- */
- public void removeAssertionResults() {
- this.assertionResults = null;
- }
-
- /**
+ /**
+ * Allow custom SampleSenders to drop unwanted assertionResults
+ */
+ public void removeAssertionResults() {
+ this.assertionResults = null;
+ }
+
+ /**
* Allow custom SampleSenders to drop unwanted subResults
- */
- public void removeSubResults() {
- this.subResults = null;
- }
+ */
+ public void removeSubResults() {
+ this.subResults = null;
+ }
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
Tue Sep 29 16:39:19 2009
@@ -49,225 +49,225 @@
import org.apache.log.Logger;
public class TableEditor extends PropertyEditorSupport implements
FocusListener,TestBeanPropertyEditor,TableModelListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
-
- public static final String CLASSNAME = "tableObject.classname"; //
$NON-NLS-1$
- public static final String HEADERS = "table.headers"; // $NON-NLS-1$
- public static final String OBJECT_PROPERTIES =
"tableObject.properties"; // $NON-NLS-1$
-
- private JTable table;
- private ObjectTableModel model;
- private Class<?> clazz;
- private PropertyDescriptor descriptor;
- private final JButton addButton,removeButton,clearButton;
-
- public TableEditor() {
- addButton = new JButton(JMeterUtils.getResString("add")); //
$NON-NLS-1$
- addButton.addActionListener(new AddListener());
- removeButton = new JButton(JMeterUtils.getResString("remove"));
// $NON-NLS-1$
- removeButton.addActionListener(new RemoveListener());
- clearButton = new JButton(JMeterUtils.getResString("clear"));
// $NON-NLS-1$
- clearButton.addActionListener(new ClearListener());
- }
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ public static final String CLASSNAME = "tableObject.classname"; //
$NON-NLS-1$
+ public static final String HEADERS = "table.headers"; // $NON-NLS-1$
+ public static final String OBJECT_PROPERTIES = "tableObject.properties";
// $NON-NLS-1$
+
+ private JTable table;
+ private ObjectTableModel model;
+ private Class<?> clazz;
+ private PropertyDescriptor descriptor;
+ private final JButton addButton,removeButton,clearButton;
+
+ public TableEditor() {
+ addButton = new JButton(JMeterUtils.getResString("add")); //
$NON-NLS-1$
+ addButton.addActionListener(new AddListener());
+ removeButton = new JButton(JMeterUtils.getResString("remove")); //
$NON-NLS-1$
+ removeButton.addActionListener(new RemoveListener());
+ clearButton = new JButton(JMeterUtils.getResString("clear")); //
$NON-NLS-1$
+ clearButton.addActionListener(new ClearListener());
+ }
- @Override
+ @Override
public String getAsText() {
- return null;
- }
+ return null;
+ }
- @Override
+ @Override
public Component getCustomEditor() {
- JComponent pane = makePanel();
- pane.doLayout();
- pane.validate();
- return pane;
- }
-
- private JComponent makePanel()
- {
- JPanel p = new JPanel(new BorderLayout());
- JScrollPane scroller = new JScrollPane(table);
- scroller.setPreferredSize(scroller.getMinimumSize());
- p.add(scroller,BorderLayout.CENTER);
- JPanel south = new JPanel();
- south.add(addButton);
- south.add(removeButton);
- south.add(clearButton);
- p.add(south,BorderLayout.SOUTH);
- return p;
- }
+ JComponent pane = makePanel();
+ pane.doLayout();
+ pane.validate();
+ return pane;
+ }
+
+ private JComponent makePanel()
+ {
+ JPanel p = new JPanel(new BorderLayout());
+ JScrollPane scroller = new JScrollPane(table);
+ scroller.setPreferredSize(scroller.getMinimumSize());
+ p.add(scroller,BorderLayout.CENTER);
+ JPanel south = new JPanel();
+ south.add(addButton);
+ south.add(removeButton);
+ south.add(clearButton);
+ p.add(south,BorderLayout.SOUTH);
+ return p;
+ }
- @Override
+ @Override
public Object getValue() {
- return model.getObjectList();
- }
+ return model.getObjectList();
+ }
- @Override
+ @Override
public void setAsText(String text) throws IllegalArgumentException {
- //not interested in this method.
- }
+ //not interested in this method.
+ }
- @Override
+ @Override
public void setValue(Object value) {
- if(value != null)
- {
- model.setRows(convertCollection((Collection<?>)value));
- }
- else model.clearData();
- this.firePropertyChange();
- }
-
- private Collection<Object> convertCollection(Collection<?> values)
- {
- List<Object> l = new LinkedList<Object>();
- for(Object obj : values)
- {
- if(obj instanceof TestElementProperty)
- {
- l.add(((TestElementProperty)obj).getElement());
- }
- else
- {
- l.add(obj);
- }
- }
- return l;
- }
+ if(value != null)
+ {
+ model.setRows(convertCollection((Collection<?>)value));
+ }
+ else model.clearData();
+ this.firePropertyChange();
+ }
+
+ private Collection<Object> convertCollection(Collection<?> values)
+ {
+ List<Object> l = new LinkedList<Object>();
+ for(Object obj : values)
+ {
+ if(obj instanceof TestElementProperty)
+ {
+ l.add(((TestElementProperty)obj).getElement());
+ }
+ else
+ {
+ l.add(obj);
+ }
+ }
+ return l;
+ }
- @Override
+ @Override
public boolean supportsCustomEditor() {
- return true;
- }
+ return true;
+ }
- /**
- * For the table editor, the tag must simply be the name of the class
of object it will hold
- * where each row holds one object.
- */
- public void setDescriptor(PropertyDescriptor descriptor) {
- try {
- this.descriptor = descriptor;
- clazz =
Class.forName((String)descriptor.getValue(CLASSNAME));
- initializeModel();
- } catch (ClassNotFoundException e) {
- throw new RuntimeException("The Table Editor requires
one TAG be set - the name of the object to represent a row",e);
- }
- }
-
- void initializeModel()
- {
- if(clazz == String.class)
- {
- model = new
ObjectTableModel((String[])descriptor.getValue(HEADERS),new Functor[0],new
Functor[0],new Class[]{String.class});
- model.addTableModelListener(this);
- }
- else
- {
- String[] props =
(String[])descriptor.getValue(OBJECT_PROPERTIES);
- Functor[] writers = new Functor[props.length];
- Functor[] readers = new Functor[props.length];
- Class<?>[] editors = new Class[props.length];
- int count = 0;
- for(String propName : props)
- {
- propName =
propName.substring(0,1).toUpperCase() + propName.substring(1);
- writers[count] = createWriter(clazz,propName);
- readers[count] = createReader(clazz,propName);
- editors[count] =
getArgForWriter(clazz,propName);
- count++;
- }
- model = new
ObjectTableModel((String[])descriptor.getValue(HEADERS),readers,writers,editors);
- model.addTableModelListener(this);
- }
- table = new JTable(model);
- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- table.addFocusListener(this);
- }
-
- Functor createWriter(Class<?> c,String propName)
- {
- String setter = "set" + propName; // $NON-NLS-1$
- return new Functor(setter);
- }
-
- Functor createReader(Class<?> c,String propName)
- {
- String getter = "get" + propName; // $NON-NLS-1$
- try
- {
- c.getMethod(getter,new Class[0]);
- return new Functor(getter);
- }
- catch(Exception e) { return new Functor("is" + propName); }
- }
-
- Class<?> getArgForWriter(Class<?> c,String propName)
- {
- String setter = "set" + propName; // $NON-NLS-1$
- for(Method m : c.getMethods())
- {
- if(m.getName().equals(setter))
- {
- return m.getParameterTypes()[0];
- }
- }
- return null;
- }
-
- public void tableChanged(TableModelEvent e) {
- this.firePropertyChange();
- }
-
- public void focusGained(FocusEvent e) {
-
- }
+ /**
+ * For the table editor, the tag must simply be the name of the class of
object it will hold
+ * where each row holds one object.
+ */
+ public void setDescriptor(PropertyDescriptor descriptor) {
+ try {
+ this.descriptor = descriptor;
+ clazz = Class.forName((String)descriptor.getValue(CLASSNAME));
+ initializeModel();
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException("The Table Editor requires one TAG be
set - the name of the object to represent a row",e);
+ }
+ }
+
+ void initializeModel()
+ {
+ if(clazz == String.class)
+ {
+ model = new
ObjectTableModel((String[])descriptor.getValue(HEADERS),new Functor[0],new
Functor[0],new Class[]{String.class});
+ model.addTableModelListener(this);
+ }
+ else
+ {
+ String[] props = (String[])descriptor.getValue(OBJECT_PROPERTIES);
+ Functor[] writers = new Functor[props.length];
+ Functor[] readers = new Functor[props.length];
+ Class<?>[] editors = new Class[props.length];
+ int count = 0;
+ for(String propName : props)
+ {
+ propName = propName.substring(0,1).toUpperCase() +
propName.substring(1);
+ writers[count] = createWriter(clazz,propName);
+ readers[count] = createReader(clazz,propName);
+ editors[count] = getArgForWriter(clazz,propName);
+ count++;
+ }
+ model = new
ObjectTableModel((String[])descriptor.getValue(HEADERS),readers,writers,editors);
+ model.addTableModelListener(this);
+ }
+ table = new JTable(model);
+ table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ table.addFocusListener(this);
+ }
+
+ Functor createWriter(Class<?> c,String propName)
+ {
+ String setter = "set" + propName; // $NON-NLS-1$
+ return new Functor(setter);
+ }
+
+ Functor createReader(Class<?> c,String propName)
+ {
+ String getter = "get" + propName; // $NON-NLS-1$
+ try
+ {
+ c.getMethod(getter,new Class[0]);
+ return new Functor(getter);
+ }
+ catch(Exception e) { return new Functor("is" + propName); }
+ }
+
+ Class<?> getArgForWriter(Class<?> c,String propName)
+ {
+ String setter = "set" + propName; // $NON-NLS-1$
+ for(Method m : c.getMethods())
+ {
+ if(m.getName().equals(setter))
+ {
+ return m.getParameterTypes()[0];
+ }
+ }
+ return null;
+ }
- public void focusLost(FocusEvent e) {
- final int editingRow = table.getEditingRow();
+ public void tableChanged(TableModelEvent e) {
+ this.firePropertyChange();
+ }
+
+ public void focusGained(FocusEvent e) {
+
+ }
+
+ public void focusLost(FocusEvent e) {
+ final int editingRow = table.getEditingRow();
final int editingColumn = table.getEditingColumn();
CellEditor ce = null;
if (editingRow != -1 && editingColumn != -1){
ce = table.getCellEditor(editingRow,editingColumn);
}
- Component editor = table.getEditorComponent();
- if(ce != null && (editor == null || editor !=
e.getOppositeComponent()))
- {
- ce.stopCellEditing();
- }
- else if(editor != null)
- {
- editor.addFocusListener(this);
- }
- this.firePropertyChange();
- }
-
- private class AddListener implements ActionListener
- {
- public void actionPerformed(ActionEvent e)
- {
- try
- {
- model.addRow(clazz.newInstance());
- }catch(Exception err)
- {
- log.error("The class type given to TableEditor
was not instantiable. ",err);
- }
- }
- }
-
- private class RemoveListener implements ActionListener
- {
- public void actionPerformed(ActionEvent e)
- {
- model.removeRow(table.getSelectedRow());
- }
- }
-
- private class ClearListener implements ActionListener
- {
- public void actionPerformed(ActionEvent e)
- {
- model.clearData();
- }
- }
+ Component editor = table.getEditorComponent();
+ if(ce != null && (editor == null || editor !=
e.getOppositeComponent()))
+ {
+ ce.stopCellEditing();
+ }
+ else if(editor != null)
+ {
+ editor.addFocusListener(this);
+ }
+ this.firePropertyChange();
+ }
+
+ private class AddListener implements ActionListener
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ try
+ {
+ model.addRow(clazz.newInstance());
+ }catch(Exception err)
+ {
+ log.error("The class type given to TableEditor was not
instantiable. ",err);
+ }
+ }
+ }
+
+ private class RemoveListener implements ActionListener
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ model.removeRow(table.getSelectedRow());
+ }
+ }
+
+ private class ClearListener implements ActionListener
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ model.clearData();
+ }
+ }
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanPropertyEditor.java
Tue Sep 29 16:39:19 2009
@@ -22,7 +22,7 @@
import java.beans.PropertyEditor;
public interface TestBeanPropertyEditor extends PropertyEditor {
-
- public void setDescriptor(PropertyDescriptor descriptor);
+
+ public void setDescriptor(PropertyDescriptor descriptor);
}
Modified: jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java (original)
+++ jakarta/jmeter/trunk/src/junit/woolfel/DummyTestCase.java Tue Sep 29
16:39:19 2009
@@ -22,15 +22,15 @@
public class DummyTestCase extends TestCase {
- public DummyTestCase() {
- super();
- System.out.println("public DummyTestCase()");
- }
+ public DummyTestCase() {
+ super();
+ System.out.println("public DummyTestCase()");
+ }
- protected DummyTestCase(String arg0) {
- super(arg0);
+ protected DummyTestCase(String arg0) {
+ super(arg0);
System.out.println("protected DummyTestCase("+arg0+")");
- }
+ }
@Override
public void setUp(){
Modified: jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java (original)
+++ jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest.java Tue Sep 29
16:39:19 2009
@@ -20,15 +20,15 @@
public class SubDummyTest extends DummyTestCase {
- public SubDummyTest() {
- super();
+ public SubDummyTest() {
+ super();
System.out.println("public SubDummyTest()");
- }
+ }
- public SubDummyTest(String arg0) {
- super(arg0);
+ public SubDummyTest(String arg0) {
+ super(arg0);
System.out.println("public SubDummyTest("+arg0+")");
- }
+ }
public void oneTimeSetUp() {
System.out.println("SubDummyTest#oneTimeSetUp(): "+getName());
Modified: jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java (original)
+++ jakarta/jmeter/trunk/src/junit/woolfel/SubDummyTest2.java Tue Sep 29
16:39:19 2009
@@ -20,16 +20,16 @@
public class SubDummyTest2 extends DummyTestCase {
- @SuppressWarnings("unused")
+ @SuppressWarnings("unused")
private SubDummyTest2() {
- super();
+ super();
System.out.println("private SubDummyTest2()");
- }
+ }
- public SubDummyTest2(String arg0) {
- super(arg0);
+ public SubDummyTest2(String arg0) {
+ super(arg0);
System.out.println("public SubDummyTest2("+arg0+")");
- }
+ }
public void oneTimeSetUp() {
System.out.println("SubDummyTest2#oneTimeSetUp(): "+getName());
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=820025&r1=820024&r2=820025&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Tue Sep 29 16:39:19 2009
@@ -491,12 +491,12 @@
final String HTTPS_PREFIX = "https://";;
if (forcedHTTPS &&
HTTPConstants.HEADER_LOCATION.equalsIgnoreCase(parts[0])
&& parts[1].substring(0,
HTTPS_PREFIX.length()).equalsIgnoreCase(HTTPS_PREFIX)){
-
headerLines[i]=headerLines[i].replaceFirst(parts[1].substring(0,HTTPS_PREFIX.length()),
"http://";);
+
headerLines[i]=headerLines[i].replaceFirst(parts[1].substring(0,HTTPS_PREFIX.length()),
"http://";);
continue;
}
if (forcedHTTPS &&
HTTPConstants.HEADER_COOKIE.equalsIgnoreCase(parts[0]) ||
HTTPConstants.HEADER_SET_COOKIE.equalsIgnoreCase(parts[0]))
{
- headerLines[i]=headerLines[i].replaceAll(" secure",
"").trim(); //in forced https cookies need to be unsecured...
+ headerLines[i]=headerLines[i].replaceAll(" secure",
"").trim(); //in forced https cookies need to be unsecured...
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
