Re: svn commit: r1802732 - in /jmeter/trunk: src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java

[sebb]

On 23 July 2017 at 16:48,   wrote:
> Author: fschumacher
> Date: Sun Jul 23 15:48:41 2017
> New Revision: 1802732
>
> URL: http://svn.apache.org/viewvc?rev=1802732&view=rev
> Log:
> Change equals and hashCode so that they are more independent from 
> JMeterVariables.
>
> Modified:
> 
> jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java
> 
> jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
>
> Modified: 
> jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java?rev=1802732&r1=1802731&r2=1802732&view=diff
> ==
> --- 
> jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java
>  (original)
> +++ 
> jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java
>  Sun Jul 23 15:48:41 2017
> @@ -40,8 +40,13 @@ class UnmodifiableJMeterVariables extend
>
>  @Override
>  public int hashCode() {
> -return variables.hashCode();
> +final int prime = 31;
> +int result = 1;
> +result = prime * result

This is always 31.

> ++ ((variables == null) ? 0 : variables.hashCode());
> +return result;

Not sure what the point of adding 31 is.

Why not just use:

return variables == null) ? 0 : variables.hashCode()

>  }
> +
>
>  @Override
>  public String getThreadName() {
> @@ -88,8 +93,21 @@ class UnmodifiableJMeterVariables extend
>  return variables.get(key);
>  }
>
> +@Override
>  public boolean equals(Object obj) {
> -return variables.equals(obj);
> +if (this == obj)
> +return true;
> +if (obj == null)
> +return false;
> +if (getClass() != obj.getClass())
> +return false;

Since null is not and instanceof anything, the last two checks can be
simplified to:

if (!obj instanceof UnmodifiableJMeterVariables) {
return false;
}

> +UnmodifiableJMeterVariables other = (UnmodifiableJMeterVariables) 
> obj;
> +if (variables == null) {
> +if (other.variables != null)
> +return false;
> +} else if (!variables.equals(other.variables))
> +return false;
> +return true;
>  }
>
>  @Override
>
> Modified: 
> jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java?rev=1802732&r1=1802731&r2=1802732&view=diff
> ==
> --- 
> jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
>  (original)
> +++ 
> jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
>  Sun Jul 23 15:48:41 2017
> @@ -124,13 +124,26 @@ public class TestUnmodifiableJMeterVaria
>  }
>
>  @Test
> -public void testEqualsObject() {
> -assertThat(unmodifiables, CoreMatchers.is(vars));
> +public void testEqualsObjectSymmetry() {
> +UnmodifiableJMeterVariables otherUnmodifiables = new 
> UnmodifiableJMeterVariables(vars);
> +assertThat(unmodifiables, CoreMatchers.is(otherUnmodifiables));
> +assertThat(otherUnmodifiables, CoreMatchers.is(unmodifiables));
> +}
> +
> +@Test
> +public void testEqualsObjectReflexivity() {
> +assertThat(unmodifiables, CoreMatchers.is(unmodifiables));
> +}
> +
> +@Test
> +public void testEqualsObjectWithJMeterVariables() {
> +assertThat(unmodifiables.equals(vars), 
> CoreMatchers.is(vars.equals(unmodifiables)));
>  }
>
>  @Test
>  public void testHashCode() {
> -assertThat(unmodifiables.hashCode(), 
> CoreMatchers.is(vars.hashCode()));
> +UnmodifiableJMeterVariables otherUnmodifiables = new 
> UnmodifiableJMeterVariables(vars);
> +assertThat(unmodifiables.hashCode(), 
> CoreMatchers.is(otherUnmodifiables.hashCode()));
>  }
>
>  }
>
>

Re: svn commit: r1803103 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java

[sebb]

On 26 July 2017 at 20:56,   wrote:
> Author: fschumacher
> Date: Wed Jul 26 19:56:08 2017
> New Revision: 1803103
>
> URL: http://svn.apache.org/viewvc?rev=1803103&view=rev
> Log:
> Guard debug log messages that call a function with Logger#isDebugEnabled
>
> Bugzilla Id: 61176
>
> Modified:
> 
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
>
> Modified: 
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java?rev=1803103&r1=1803102&r2=1803103&view=diff
> ==
> --- 
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
>  (original)
> +++ 
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
>  Wed Jul 26 19:56:08 2017
> @@ -498,8 +498,10 @@ public class CacheManager extends Config
>
>  private CacheEntry getEntry(String url, Header[] headers) {
>  CacheEntry entry = getCache().get(url);

Fetch the cache separately here - see below.

> -log.debug("Cache: {}", getCache());
> -log.debug("inCache {} {} {}", url, entry, headers);
> +if (log.isDebugEnabled()) {
> +log.debug("Cache: {}", getCache());

In this case, it would be better to fetch the cache once and store in
a local variable.

> +log.debug("inCache {} {} {}", url, entry, headers);
> +}
>  if (entry == null) {
>  log.debug("No entry found for url {}", url);
>  return null;
> @@ -509,12 +511,16 @@ public class CacheManager extends Config
>  return entry;
>  }
>  if (headers == null) {
> -log.debug("Entry {} found, but it should depend on vary {} for 
> url {}", entry, entry.getVaryHeader(), url);
> +if (log.isDebugEnabled()) {
> +log.debug("Entry {} found, but it should depend on vary {} 
> for url {}", entry, entry.getVaryHeader(), url);
> +}
>  return null;
>  }
>  Pair varyPair = getVaryHeader(entry.getVaryHeader(), 
> headers);
>  if (varyPair != null) {
> -log.debug("Looking again for {} because of {} with vary: {} 
> ({})", url, entry, entry.getVaryHeader(), varyPair);
> +if (log.isDebugEnabled()) {
> +log.debug("Looking again for {} because of {} with vary: {} 
> ({})", url, entry, entry.getVaryHeader(), varyPair);
> +}
>  return getEntry(varyUrl(url, entry.getVaryHeader(), 
> varyPair.getRight()), null);
>  }
>  return null;
>
>

Re: svn commit: r1803375 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/action/ActionNames.java src/core/org/apache/jmeter/gui/action/CheckDirty.java src/core/org/apache/jmeter/gui/action/Cut.java

[sebb]

On 29 July 2017 at 15:29,   wrote:
> Author: pmouawad
> Date: Sat Jul 29 14:29:26 2017
> New Revision: 1803375
>
> URL: http://svn.apache.org/viewvc?rev=1803375&view=rev
> Log:
> Bug 61359 - When cutting an element from Tree, Test plan is not marked as 
> dirty
> Bugzilla Id: 61359
>
> Modified:
> jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
> jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
> jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java
> jmeter/trunk/xdocs/changes.xml
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1803375&r1=1803374&r2=1803375&view=diff
> ==
> --- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java 
> (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Sat 
> Jul 29 14:29:26 2017
> @@ -40,6 +40,7 @@ public final class ActionNames {
>  public static final String CHANGE_PARENT= "Change Parent"; // 
> $NON-NLS-1$
>  public static final String CHECK_DIRTY  = "check_dirty"; // 
> $NON-NLS-1$
>  public static final String CHECK_REMOVE = "check_remove"; // 
> $NON-NLS-1$
> +public static final String CHECK_CUT= "check_cut"; // $NON-NLS-1$
>  public static final String CLEAR= "action.clear"; // 
> $NON-NLS-1$
>  public static final String CLEAR_ALL= "action.clear_all"; // 
> $NON-NLS-1$
>  public static final String CLOSE= "close"; // $NON-NLS-1$
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java?rev=1803375&r1=1803374&r2=1803375&view=diff
> ==
> --- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java 
> (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java Sat 
> Jul 29 14:29:26 2017
> @@ -59,6 +59,7 @@ public class CheckDirty extends Abstract
>  commands.add(ActionNames.SUB_TREE_LOADED);
>  commands.add(ActionNames.ADD_ALL);
>  commands.add(ActionNames.CHECK_REMOVE);
> +commands.add(ActionNames.CHECK_CUT);

Is this really needed?
See below.

>  }
>
>  public CheckDirty() {
> @@ -91,7 +92,8 @@ public class CheckDirty extends Abstract
>  if (isWorkbenchSaveable()) {
>  
> GuiPackage.getInstance().getTreeModel().getWorkBench().traverse(this);
>  }
> -} else if (action.equals(ActionNames.CHECK_REMOVE)) {
> +} else if (action.equals(ActionNames.CHECK_REMOVE) ||
> +action.equals(ActionNames.CHECK_CUT)) {
>  GuiPackage guiPackage = GuiPackage.getInstance();
>  JMeterTreeNode[] nodes = 
> guiPackage.getTreeListener().getSelectedNodes();
>  removeMode = true;
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java?rev=1803375&r1=1803374&r2=1803375&view=diff
> ==
> --- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java Sat Jul 29 
> 14:29:26 2017
> @@ -49,6 +49,7 @@ public class Cut extends AbstractAction
>  @Override
>  public void doAction(ActionEvent e) {
>  GuiPackage guiPack = GuiPackage.getInstance();
> +ActionRouter.getInstance().actionPerformed(new 
> ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_CUT));

Why not just use CHECK_REMOVE here?

>  JMeterTreeNode[] currentNodes = 
> guiPack.getTreeListener().getSelectedNodes();
>
>  currentNodes = Copy.keepOnlyAncestors(currentNodes);
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1803375&r1=1803374&r2=1803375&view=diff
> ==
> --- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
> +++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jul 29 14:29:26 2017
> @@ -221,6 +221,7 @@ Incorporated feed back about unclear doc
>  57962Allow to use variables ( from User Defined Variables 
> only ) in all listeners in slave mode
>  61270Fixed width fonts too small in text areas to read 
> under hidpi (user manual bug)
>  61292Make processing of samples in reporter more 
> robust.
> +61359When cutting an element from Tree, Test plan is not 
> marked as dirty
>  
>
>   
>
>

Re: Issue adding generated CA in Firefox

[sebb]

10.12.6

On 30 July 2017 at 13:50, Philippe Mouawad  wrote:
> I mean what version of Mac OSX
>
> On Sun, Jul 30, 2017 at 2:38 PM, sebb  wrote:
>
>> On 30 July 2017 at 13:31, Philippe Mouawad 
>> wrote:
>> > Thanks for your feedback.
>> > What is your OS ?
>>
>> See below
>>
>> > Thanks
>> >
>> > On Sun, Jul 30, 2017 at 2:24 PM, sebb  wrote:
>> >
>> >> Just tried building JMeter trunk.
>> >> Cert created OK, and loads OK into FF 54.0.1 (MacOSX)
>>
>> As above
>>
>> >>
>> >> Try creating a new Firefox profile.
>> >> You can change the profile to always use the proxy host and port.
>> >> Also it's safer not to install the cert in your main browser.
>> >> Remove any unnecessary plugins.
>> >>
>> >>
>> >> On 30 July 2017 at 10:40, Philippe Mouawad 
>> >> wrote:
>> >> > Thanks Felox
>> >> >
>> >> > On Sunday, July 30, 2017, Felix Schumacher <
>> >> > felix.schumac...@internetallee.de> wrote:
>> >> >
>> >> >> Am 29.07.2017 um 16:00 schrieb Philippe Mouawad:
>> >> >>
>> >> >>> Hi Felix,
>> >> >>> I'm on Macosx, can you have a look at it ?
>> >> >>>
>> >> >> Looks good to me.
>> >> >>
>> >> >>
>> >> >>> I didn't find yet how to see logs for FF on Macosx.
>> >> >>> I tried to restart in safe mode, still nothing happens.
>> >> >>>
>> >> >> Same here. I didn't find any change logs that indicate that there
>> were
>> >> >> changes regarding certificate handling.
>> >> >>
>> >> >> Sorry,
>> >> >>  Felix
>> >> >>
>> >> >>
>> >> >>> Regards
>> >> >>>
>> >> >>>
>> >> >>>
>> >> >>> On Sat, Jul 29, 2017 at 3:34 PM, Felix Schumacher > >> >>> internetallee.de > wrote:
>> >> >>>
>> >> >>>
>> >> >>>
>> >> >>> Am 29. Juli 2017 14:49:55 MESZ schrieb Philippe Mouawad
>> >> >>> mailto:philippe.moua...@gmail.com
>> >>:
>> >> >>> >Hi Felix,
>> >> >>> >No error message, nothing happens.
>> >> >>> >
>> >> >>> >Note I am on MacOsx. I'll retry and try to find ff logs.
>> >> >>>
>> >> >>> Is the cert valid when you examine it with openssl?
>> >> >>>
>> >> >>> Felix
>> >> >>> >
>> >> >>> >regards
>> >> >>> >
>> >> >>> >On Saturday, July 29, 2017, Felix Schumacher <
>> >> >>> >felix.schumac...@internetallee.de
>> >> >>> > wrote:
>> >> >>> >
>> >> >>> >> Am 28.07.2017 um 22:09 schrieb Philippe Mouawad:
>> >> >>> >>
>> >> >>> >>> Hello,
>> >> >>> >>> Since this evening, I am unable to add to FF 54.0.1 the
>> >> >>> certificate
>> >> >>> >>> authority file generated by recorder.
>> >> >>> >>>
>> >> >>> >> On a FF 54.0 (no .1) I had no problem to include a newly
>> >> generated
>> >> >>> >> proxy-CA certificate.
>> >> >>> >> The change log for 54.0.1 doesn't indicate any changes
>> related
>> >> to
>> >> >>> >> certificate handling.
>> >> >>> >> Are you getting any error-messages?
>> >> >>> >>
>> >> >>> >> Felix
>> >> >>> >>
>> >> >>> >>>
>> >> >>> >>> Am I alone ?
>> >> >>> >>>
>> >> >>> >>> Thanks
>> >> >>> >>> Regards
>> >> >>> >>>
>> >> >>> >>>
>> >> >>> >>
>> >> >>>
>> >> >>>
>> >> >>>
>> >> >>>
>> >> >>> --
>> >> >>> Cordialement.
>> >> >>> Philippe Mouawad.
>> >> >>>
>> >> >>>
>> >> >>>
>> >> >>
>> >> >
>> >> > --
>> >> > Cordialement.
>> >> > Philippe Mouawad.
>> >>
>> >
>> >
>> >
>> > --
>> > Cordialement.
>> > Philippe Mouawad.
>>
>
>
>
> --
> Cordialement.
> Philippe Mouawad.

Re: Issue adding generated CA in Firefox

[Philippe Mouawad]

I mean what version of Mac OSX

On Sun, Jul 30, 2017 at 2:38 PM, sebb  wrote:

> On 30 July 2017 at 13:31, Philippe Mouawad 
> wrote:
> > Thanks for your feedback.
> > What is your OS ?
>
> See below
>
> > Thanks
> >
> > On Sun, Jul 30, 2017 at 2:24 PM, sebb  wrote:
> >
> >> Just tried building JMeter trunk.
> >> Cert created OK, and loads OK into FF 54.0.1 (MacOSX)
>
> As above
>
> >>
> >> Try creating a new Firefox profile.
> >> You can change the profile to always use the proxy host and port.
> >> Also it's safer not to install the cert in your main browser.
> >> Remove any unnecessary plugins.
> >>
> >>
> >> On 30 July 2017 at 10:40, Philippe Mouawad 
> >> wrote:
> >> > Thanks Felox
> >> >
> >> > On Sunday, July 30, 2017, Felix Schumacher <
> >> > felix.schumac...@internetallee.de> wrote:
> >> >
> >> >> Am 29.07.2017 um 16:00 schrieb Philippe Mouawad:
> >> >>
> >> >>> Hi Felix,
> >> >>> I'm on Macosx, can you have a look at it ?
> >> >>>
> >> >> Looks good to me.
> >> >>
> >> >>
> >> >>> I didn't find yet how to see logs for FF on Macosx.
> >> >>> I tried to restart in safe mode, still nothing happens.
> >> >>>
> >> >> Same here. I didn't find any change logs that indicate that there
> were
> >> >> changes regarding certificate handling.
> >> >>
> >> >> Sorry,
> >> >>  Felix
> >> >>
> >> >>
> >> >>> Regards
> >> >>>
> >> >>>
> >> >>>
> >> >>> On Sat, Jul 29, 2017 at 3:34 PM, Felix Schumacher  >> >>> internetallee.de > wrote:
> >> >>>
> >> >>>
> >> >>>
> >> >>> Am 29. Juli 2017 14:49:55 MESZ schrieb Philippe Mouawad
> >> >>> mailto:philippe.moua...@gmail.com
> >>:
> >> >>> >Hi Felix,
> >> >>> >No error message, nothing happens.
> >> >>> >
> >> >>> >Note I am on MacOsx. I'll retry and try to find ff logs.
> >> >>>
> >> >>> Is the cert valid when you examine it with openssl?
> >> >>>
> >> >>> Felix
> >> >>> >
> >> >>> >regards
> >> >>> >
> >> >>> >On Saturday, July 29, 2017, Felix Schumacher <
> >> >>> >felix.schumac...@internetallee.de
> >> >>> > wrote:
> >> >>> >
> >> >>> >> Am 28.07.2017 um 22:09 schrieb Philippe Mouawad:
> >> >>> >>
> >> >>> >>> Hello,
> >> >>> >>> Since this evening, I am unable to add to FF 54.0.1 the
> >> >>> certificate
> >> >>> >>> authority file generated by recorder.
> >> >>> >>>
> >> >>> >> On a FF 54.0 (no .1) I had no problem to include a newly
> >> generated
> >> >>> >> proxy-CA certificate.
> >> >>> >> The change log for 54.0.1 doesn't indicate any changes
> related
> >> to
> >> >>> >> certificate handling.
> >> >>> >> Are you getting any error-messages?
> >> >>> >>
> >> >>> >> Felix
> >> >>> >>
> >> >>> >>>
> >> >>> >>> Am I alone ?
> >> >>> >>>
> >> >>> >>> Thanks
> >> >>> >>> Regards
> >> >>> >>>
> >> >>> >>>
> >> >>> >>
> >> >>>
> >> >>>
> >> >>>
> >> >>>
> >> >>> --
> >> >>> Cordialement.
> >> >>> Philippe Mouawad.
> >> >>>
> >> >>>
> >> >>>
> >> >>
> >> >
> >> > --
> >> > Cordialement.
> >> > Philippe Mouawad.
> >>
> >
> >
> >
> > --
> > Cordialement.
> > Philippe Mouawad.
>



-- 
Cordialement.
Philippe Mouawad.

Re: Issue adding generated CA in Firefox

[sebb]

On 30 July 2017 at 13:31, Philippe Mouawad  wrote:
> Thanks for your feedback.
> What is your OS ?

See below

> Thanks
>
> On Sun, Jul 30, 2017 at 2:24 PM, sebb  wrote:
>
>> Just tried building JMeter trunk.
>> Cert created OK, and loads OK into FF 54.0.1 (MacOSX)

As above

>>
>> Try creating a new Firefox profile.
>> You can change the profile to always use the proxy host and port.
>> Also it's safer not to install the cert in your main browser.
>> Remove any unnecessary plugins.
>>
>>
>> On 30 July 2017 at 10:40, Philippe Mouawad 
>> wrote:
>> > Thanks Felox
>> >
>> > On Sunday, July 30, 2017, Felix Schumacher <
>> > felix.schumac...@internetallee.de> wrote:
>> >
>> >> Am 29.07.2017 um 16:00 schrieb Philippe Mouawad:
>> >>
>> >>> Hi Felix,
>> >>> I'm on Macosx, can you have a look at it ?
>> >>>
>> >> Looks good to me.
>> >>
>> >>
>> >>> I didn't find yet how to see logs for FF on Macosx.
>> >>> I tried to restart in safe mode, still nothing happens.
>> >>>
>> >> Same here. I didn't find any change logs that indicate that there were
>> >> changes regarding certificate handling.
>> >>
>> >> Sorry,
>> >>  Felix
>> >>
>> >>
>> >>> Regards
>> >>>
>> >>>
>> >>>
>> >>> On Sat, Jul 29, 2017 at 3:34 PM, Felix Schumacher > >>> internetallee.de > wrote:
>> >>>
>> >>>
>> >>>
>> >>> Am 29. Juli 2017 14:49:55 MESZ schrieb Philippe Mouawad
>> >>> mailto:philippe.moua...@gmail.com>>:
>> >>> >Hi Felix,
>> >>> >No error message, nothing happens.
>> >>> >
>> >>> >Note I am on MacOsx. I'll retry and try to find ff logs.
>> >>>
>> >>> Is the cert valid when you examine it with openssl?
>> >>>
>> >>> Felix
>> >>> >
>> >>> >regards
>> >>> >
>> >>> >On Saturday, July 29, 2017, Felix Schumacher <
>> >>> >felix.schumac...@internetallee.de
>> >>> > wrote:
>> >>> >
>> >>> >> Am 28.07.2017 um 22:09 schrieb Philippe Mouawad:
>> >>> >>
>> >>> >>> Hello,
>> >>> >>> Since this evening, I am unable to add to FF 54.0.1 the
>> >>> certificate
>> >>> >>> authority file generated by recorder.
>> >>> >>>
>> >>> >> On a FF 54.0 (no .1) I had no problem to include a newly
>> generated
>> >>> >> proxy-CA certificate.
>> >>> >> The change log for 54.0.1 doesn't indicate any changes related
>> to
>> >>> >> certificate handling.
>> >>> >> Are you getting any error-messages?
>> >>> >>
>> >>> >> Felix
>> >>> >>
>> >>> >>>
>> >>> >>> Am I alone ?
>> >>> >>>
>> >>> >>> Thanks
>> >>> >>> Regards
>> >>> >>>
>> >>> >>>
>> >>> >>
>> >>>
>> >>>
>> >>>
>> >>>
>> >>> --
>> >>> Cordialement.
>> >>> Philippe Mouawad.
>> >>>
>> >>>
>> >>>
>> >>
>> >
>> > --
>> > Cordialement.
>> > Philippe Mouawad.
>>
>
>
>
> --
> Cordialement.
> Philippe Mouawad.

Re: Issue adding generated CA in Firefox

[Philippe Mouawad]

Thanks for your feedback.
What is your OS ?

Thanks

On Sun, Jul 30, 2017 at 2:24 PM, sebb  wrote:

> Just tried building JMeter trunk.
> Cert created OK, and loads OK into FF 54.0.1 (MacOSX)
>
> Try creating a new Firefox profile.
> You can change the profile to always use the proxy host and port.
> Also it's safer not to install the cert in your main browser.
> Remove any unnecessary plugins.
>
>
> On 30 July 2017 at 10:40, Philippe Mouawad 
> wrote:
> > Thanks Felox
> >
> > On Sunday, July 30, 2017, Felix Schumacher <
> > felix.schumac...@internetallee.de> wrote:
> >
> >> Am 29.07.2017 um 16:00 schrieb Philippe Mouawad:
> >>
> >>> Hi Felix,
> >>> I'm on Macosx, can you have a look at it ?
> >>>
> >> Looks good to me.
> >>
> >>
> >>> I didn't find yet how to see logs for FF on Macosx.
> >>> I tried to restart in safe mode, still nothing happens.
> >>>
> >> Same here. I didn't find any change logs that indicate that there were
> >> changes regarding certificate handling.
> >>
> >> Sorry,
> >>  Felix
> >>
> >>
> >>> Regards
> >>>
> >>>
> >>>
> >>> On Sat, Jul 29, 2017 at 3:34 PM, Felix Schumacher  >>> internetallee.de > wrote:
> >>>
> >>>
> >>>
> >>> Am 29. Juli 2017 14:49:55 MESZ schrieb Philippe Mouawad
> >>> mailto:philippe.moua...@gmail.com>>:
> >>> >Hi Felix,
> >>> >No error message, nothing happens.
> >>> >
> >>> >Note I am on MacOsx. I'll retry and try to find ff logs.
> >>>
> >>> Is the cert valid when you examine it with openssl?
> >>>
> >>> Felix
> >>> >
> >>> >regards
> >>> >
> >>> >On Saturday, July 29, 2017, Felix Schumacher <
> >>> >felix.schumac...@internetallee.de
> >>> > wrote:
> >>> >
> >>> >> Am 28.07.2017 um 22:09 schrieb Philippe Mouawad:
> >>> >>
> >>> >>> Hello,
> >>> >>> Since this evening, I am unable to add to FF 54.0.1 the
> >>> certificate
> >>> >>> authority file generated by recorder.
> >>> >>>
> >>> >> On a FF 54.0 (no .1) I had no problem to include a newly
> generated
> >>> >> proxy-CA certificate.
> >>> >> The change log for 54.0.1 doesn't indicate any changes related
> to
> >>> >> certificate handling.
> >>> >> Are you getting any error-messages?
> >>> >>
> >>> >> Felix
> >>> >>
> >>> >>>
> >>> >>> Am I alone ?
> >>> >>>
> >>> >>> Thanks
> >>> >>> Regards
> >>> >>>
> >>> >>>
> >>> >>
> >>>
> >>>
> >>>
> >>>
> >>> --
> >>> Cordialement.
> >>> Philippe Mouawad.
> >>>
> >>>
> >>>
> >>
> >
> > --
> > Cordialement.
> > Philippe Mouawad.
>



-- 
Cordialement.
Philippe Mouawad.

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[pmouawad]

Github user pmouawad commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130241103
  
--- Diff: src/core/org/apache/jmeter/gui/UndoHistory.java ---
@@ -160,63 +133,46 @@ public void add(JMeterTreeModel treeModel, String 
comment) {
 // first clone to not convert original tree
 tree = (HashTree) tree.getTree(tree.getArray()[0]).clone();
 
-position++;
-while (history.size() > position) {
-if (log.isDebugEnabled()) {
-log.debug("Removing further record, position: {}, size: 
{}", position, history.size());
-}
-history.remove(history.size() - 1);
-}
-
 // cloning is required because we need to immute stored data
 HashTree copy = UndoCommand.convertAndCloneSubTree(tree);
 
-history.add(new UndoHistoryItem(copy, comment));
+GuiPackage guiPackage = GuiPackage.getInstance();
+//or maybe a Boolean?
+boolean dirty = guiPackage != null ? guiPackage.isDirty() : false;
--- End diff --

I investigated further code and behaviour, I think issue in incorrect dirty 
detection is due to the hypothesis made on GuiPackage#isDirty(), it appears it 
is not up to date when added to UndoHistory. 


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Re: Issue adding generated CA in Firefox

[sebb]

Just tried building JMeter trunk.
Cert created OK, and loads OK into FF 54.0.1 (MacOSX)

Try creating a new Firefox profile.
You can change the profile to always use the proxy host and port.
Also it's safer not to install the cert in your main browser.
Remove any unnecessary plugins.


On 30 July 2017 at 10:40, Philippe Mouawad  wrote:
> Thanks Felox
>
> On Sunday, July 30, 2017, Felix Schumacher <
> felix.schumac...@internetallee.de> wrote:
>
>> Am 29.07.2017 um 16:00 schrieb Philippe Mouawad:
>>
>>> Hi Felix,
>>> I'm on Macosx, can you have a look at it ?
>>>
>> Looks good to me.
>>
>>
>>> I didn't find yet how to see logs for FF on Macosx.
>>> I tried to restart in safe mode, still nothing happens.
>>>
>> Same here. I didn't find any change logs that indicate that there were
>> changes regarding certificate handling.
>>
>> Sorry,
>>  Felix
>>
>>
>>> Regards
>>>
>>>
>>>
>>> On Sat, Jul 29, 2017 at 3:34 PM, Felix Schumacher >> internetallee.de > wrote:
>>>
>>>
>>>
>>> Am 29. Juli 2017 14:49:55 MESZ schrieb Philippe Mouawad
>>> mailto:philippe.moua...@gmail.com>>:
>>> >Hi Felix,
>>> >No error message, nothing happens.
>>> >
>>> >Note I am on MacOsx. I'll retry and try to find ff logs.
>>>
>>> Is the cert valid when you examine it with openssl?
>>>
>>> Felix
>>> >
>>> >regards
>>> >
>>> >On Saturday, July 29, 2017, Felix Schumacher <
>>> >felix.schumac...@internetallee.de
>>> > wrote:
>>> >
>>> >> Am 28.07.2017 um 22:09 schrieb Philippe Mouawad:
>>> >>
>>> >>> Hello,
>>> >>> Since this evening, I am unable to add to FF 54.0.1 the
>>> certificate
>>> >>> authority file generated by recorder.
>>> >>>
>>> >> On a FF 54.0 (no .1) I had no problem to include a newly generated
>>> >> proxy-CA certificate.
>>> >> The change log for 54.0.1 doesn't indicate any changes related to
>>> >> certificate handling.
>>> >> Are you getting any error-messages?
>>> >>
>>> >> Felix
>>> >>
>>> >>>
>>> >>> Am I alone ?
>>> >>>
>>> >>> Thanks
>>> >>> Regards
>>> >>>
>>> >>>
>>> >>
>>>
>>>
>>>
>>>
>>> --
>>> Cordialement.
>>> Philippe Mouawad.
>>>
>>>
>>>
>>
>
> --
> Cordialement.
> Philippe Mouawad.

Re: Jenkins build is back to normal : JMeter Ubuntu #108

[Felix Schumacher]

Am 30. Juli 2017 12:46:52 MESZ schrieb sebb :
>On 29 July 2017 at 16:51, Felix Schumacher
> wrote:
>> Am 29.07.2017 um 17:49 schrieb Apache Jenkins Server:
>>>
>>> See
>
>>>
>> I configured the build via the web to skip test for Bug 52310 and
>allowing
>> the localhost address for rmi by adding "-Drmi_force_localhost=true
>> -Dskip.bug52310=true" to the ant properties.
>>
>> It seems that our ubuntu build host is now very similar configured to
>the
>> travis ones.
>>
>> I wonder if there is another way to configure jenkins?
>
>What sort of config do you mean?

Like the buildbot configuration in subversion. 

>
>> Felix
>>

Re: Jenkins build is back to normal : JMeter Ubuntu #108

[sebb]

On 29 July 2017 at 16:51, Felix Schumacher
 wrote:
> Am 29.07.2017 um 17:49 schrieb Apache Jenkins Server:
>>
>> See 
>>
> I configured the build via the web to skip test for Bug 52310 and allowing
> the localhost address for rmi by adding "-Drmi_force_localhost=true
> -Dskip.bug52310=true" to the ant properties.
>
> It seems that our ubuntu build host is now very similar configured to the
> travis ones.
>
> I wonder if there is another way to configure jenkins?

What sort of config do you mean?

> Felix
>

Re: Issue adding generated CA in Firefox

[Philippe Mouawad]

Thanks Felox

On Sunday, July 30, 2017, Felix Schumacher <
felix.schumac...@internetallee.de> wrote:

> Am 29.07.2017 um 16:00 schrieb Philippe Mouawad:
>
>> Hi Felix,
>> I'm on Macosx, can you have a look at it ?
>>
> Looks good to me.
>
>
>> I didn't find yet how to see logs for FF on Macosx.
>> I tried to restart in safe mode, still nothing happens.
>>
> Same here. I didn't find any change logs that indicate that there were
> changes regarding certificate handling.
>
> Sorry,
>  Felix
>
>
>> Regards
>>
>>
>>
>> On Sat, Jul 29, 2017 at 3:34 PM, Felix Schumacher > internetallee.de > wrote:
>>
>>
>>
>> Am 29. Juli 2017 14:49:55 MESZ schrieb Philippe Mouawad
>> mailto:philippe.moua...@gmail.com>>:
>> >Hi Felix,
>> >No error message, nothing happens.
>> >
>> >Note I am on MacOsx. I'll retry and try to find ff logs.
>>
>> Is the cert valid when you examine it with openssl?
>>
>> Felix
>> >
>> >regards
>> >
>> >On Saturday, July 29, 2017, Felix Schumacher <
>> >felix.schumac...@internetallee.de
>> > wrote:
>> >
>> >> Am 28.07.2017 um 22:09 schrieb Philippe Mouawad:
>> >>
>> >>> Hello,
>> >>> Since this evening, I am unable to add to FF 54.0.1 the
>> certificate
>> >>> authority file generated by recorder.
>> >>>
>> >> On a FF 54.0 (no .1) I had no problem to include a newly generated
>> >> proxy-CA certificate.
>> >> The change log for 54.0.1 doesn't indicate any changes related to
>> >> certificate handling.
>> >> Are you getting any error-messages?
>> >>
>> >> Felix
>> >>
>> >>>
>> >>> Am I alone ?
>> >>>
>> >>> Thanks
>> >>> Regards
>> >>>
>> >>>
>> >>
>>
>>
>>
>>
>> --
>> Cordialement.
>> Philippe Mouawad.
>>
>>
>>
>

-- 
Cordialement.
Philippe Mouawad.

Re: Issue adding generated CA in Firefox

[Felix Schumacher]

Am 29.07.2017 um 16:00 schrieb Philippe Mouawad:

Hi Felix,
I'm on Macosx, can you have a look at it ?

Looks good to me.



I didn't find yet how to see logs for FF on Macosx.
I tried to restart in safe mode, still nothing happens.
Same here. I didn't find any change logs that indicate that there were 
changes regarding certificate handling.


Sorry,
 Felix



Regards



On Sat, Jul 29, 2017 at 3:34 PM, Felix Schumacher 
> wrote:




Am 29. Juli 2017 14:49:55 MESZ schrieb Philippe Mouawad
mailto:philippe.moua...@gmail.com>>:
>Hi Felix,
>No error message, nothing happens.
>
>Note I am on MacOsx. I'll retry and try to find ff logs.

Is the cert valid when you examine it with openssl?

Felix
>
>regards
>
>On Saturday, July 29, 2017, Felix Schumacher <
>felix.schumac...@internetallee.de
> wrote:
>
>> Am 28.07.2017 um 22:09 schrieb Philippe Mouawad:
>>
>>> Hello,
>>> Since this evening, I am unable to add to FF 54.0.1 the
certificate
>>> authority file generated by recorder.
>>>
>> On a FF 54.0 (no .1) I had no problem to include a newly generated
>> proxy-CA certificate.
>> The change log for 54.0.1 doesn't indicate any changes related to
>> certificate handling.
>> Are you getting any error-messages?
>>
>> Felix
>>
>>>
>>> Am I alone ?
>>>
>>> Thanks
>>> Regards
>>>
>>>
>>




--
Cordialement.
Philippe Mouawad.

[GitHub] jmeter issue #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on the issue:

https://github.com/apache/jmeter/pull/300
  
I think I can reproduce Philippes problem. And it will probably look really 
strange to a user. My steps where:
* start a new test plan `Ctrl+L`
* add a thread group `Ctrl+0`
* add a http sampler `Ctrl+1`
* add a view results tree `Ctrl+9`
* move view results tree above the http sampler
* undo (I wish I could have pressed `Ctrl+Z`)
I end up with two view results trees.



---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130236104
  
--- Diff: src/core/org/apache/jmeter/gui/UndoHistory.java ---
@@ -118,8 +87,12 @@ public void clear() {
 return;
 }
 log.debug("Clearing undo history");
-history.clear();
-position = INITIAL_POS;
+manager.discardAllEdits();
+if (isTransaction()) {
+log.warn("Clearing undo history with " + transactions.size() + 
" unfinished transactions");
--- End diff --

I like the logs to use the formatting/placeholder feature `{}` together 
with parameters.


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130236542
  
--- Diff: src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java ---
@@ -258,6 +259,7 @@ private void doSearch(ActionEvent e) {
 jTree.expandPath(new TreePath(jMeterTreeNode.getPath()));
 }
 }
+guiPackage.endUndoTransaction();
--- End diff --

No `try { ... } finally { guiPackage.endUndoTransaction() }` here? Why 
above?


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130236022
  
--- Diff: src/core/org/apache/jmeter/gui/TreeState.java ---
@@ -0,0 +1,84 @@
+package org.apache.jmeter.gui;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.JTree;
+
+public interface TreeState {
+
+/**
+ * Restore tree expanded and selected state
+ *
+ * @param guiInstance GuiPackage to be used
+ */
+void restore(GuiPackage guiInstance);
+
+final static TreeState NOTHING = new TreeState() {
+@Override
+public void restore(GuiPackage guiInstance) {
+//nothing
+}
+};
+
+/**
+ * Save tree expanded and selected state
+ *
+ * @param guiPackage {@link GuiPackage} to be used
+ */
+public static TreeState from(GuiPackage guiPackage) {
+if (guiPackage == null) {
+return NOTHING;
+}
+
+MainFrame mainframe = guiPackage.getMainFrame();
+if (mainframe != null) {
+final JTree tree = mainframe.getTree();
+int savedSelected = tree.getMinSelectionRow();
+ArrayList savedExpanded = new ArrayList<>();
+
+for (int rowN = 0; rowN < tree.getRowCount(); rowN++) {
+if (tree.isExpanded(rowN)) {
+savedExpanded.add(rowN);
+}
+}
+
+return new TreeStateImpl(savedSelected, savedExpanded);
+}
+
+return NOTHING;
+}
+
+static final class TreeStateImpl implements TreeState {
+
+// GUI tree expansion state
+private final List savedExpanded;
+
+// GUI tree selected row
+private final int savedSelected;
+
+public TreeStateImpl(int savedSelected, List 
savedExpanded) {
+this.savedSelected = savedSelected;
+this.savedExpanded = savedExpanded;
+}
+
+@Override
+public void restore(GuiPackage guiInstance) {
+MainFrame mainframe = guiInstance.getMainFrame();
+if (mainframe == null) {
+//log?
+return;
+}
+
+final JTree tree = mainframe.getTree();
+
+if (savedExpanded.size() > 0) {
--- End diff --

use `isEmpty()` can be more efficient


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130236378
  
--- Diff: src/core/org/apache/jmeter/gui/action/ActionRouter.java ---
@@ -67,6 +72,9 @@ public void actionPerformed(final ActionEvent e) {
 
 private void performAction(final ActionEvent e) {
 String actionCommand = e.getActionCommand();
+if(!NO_TRANSACTION_ACTIONS.contains(actionCommand)) {
--- End diff --

Perhaps a small helper method `needsTransaction(actionCommand)` would help 
readability, as it would get rid of the double negation (`!NO..`)


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130235928
  
--- Diff: src/core/org/apache/jmeter/gui/TreeState.java ---
@@ -0,0 +1,84 @@
+package org.apache.jmeter.gui;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.JTree;
+
+public interface TreeState {
+
+/**
+ * Restore tree expanded and selected state
+ *
+ * @param guiInstance GuiPackage to be used
+ */
+void restore(GuiPackage guiInstance);
+
+final static TreeState NOTHING = new TreeState() {
--- End diff --

`static final` to conform with java conventions and the anonymous class 
implementing `NOTHING` could be rewritten as a lambda function.


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130236483
  
--- Diff: src/core/org/apache/jmeter/gui/action/CheckDirty.java ---
@@ -64,11 +64,12 @@
 public CheckDirty() {
 previousGuiItems = new HashMap<>();
 ActionRouter.getInstance().addPreActionListener(ExitCommand.class, 
this);
+
ActionRouter.getInstance().addPostActionListener(UndoCommand.class, this);
 }
 
 @Override
 public void actionPerformed(ActionEvent e) {
-if (e.getActionCommand().equals(ActionNames.EXIT)) {
+if (e.getActionCommand().equals(ActionNames.EXIT) || 
e.getActionCommand().equals(ActionNames.UNDO) || 
e.getActionCommand().equals(ActionNames.REDO)) {
--- End diff --

Maybe we should define one set of names that identify the commands that 
should call `doAction` than this would be probably more readable.


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130235880
  
--- Diff: src/core/org/apache/jmeter/gui/SimpleCompoundEdit.java ---
@@ -0,0 +1,14 @@
+package org.apache.jmeter.gui;
+
+import javax.swing.undo.CompoundEdit;
+
+public class SimpleCompoundEdit extends CompoundEdit {
+
+public boolean isEmpty() {
+return size() == 0;
--- End diff --

Wouldn't it be nicer and more efficient to delegate `isEmpty` to edit?


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130235898
  
--- Diff: src/core/org/apache/jmeter/gui/SimpleCompoundEdit.java ---
@@ -0,0 +1,14 @@
+package org.apache.jmeter.gui;
+
+import javax.swing.undo.CompoundEdit;
+
+public class SimpleCompoundEdit extends CompoundEdit {
--- End diff --

This is a serializable class but a serial version uid field is missing


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter pull request #300: Bug 57039 - Inconsistency with the undo/redo log

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/jmeter/pull/300#discussion_r130236267
  
--- Diff: src/core/org/apache/jmeter/gui/UndoHistoryItem.java ---
@@ -35,31 +36,48 @@
 private final HashTree tree;
 // TODO: find a way to show this comment in menu item and toolbar 
tooltip
 private final String comment;
+private final TreeState treeState;
+private final boolean dirty;
 
 /**
  * This constructor is for Unit test purposes only
  * @deprecated DO NOT USE
  */
 @Deprecated
 public UndoHistoryItem() {
-tree = null;
-comment = null;
+this(null, null, null, false);
 }
 
 /**
  * @param copy HashTree
  * @param acomment String
  */
-public UndoHistoryItem(HashTree copy, String acomment) {
+public UndoHistoryItem(HashTree copy, String acomment, TreeState 
treeState, boolean dirty) {
 tree = copy;
 comment = acomment;
--- End diff --

I would add `this.` to `copy` and `comment` to be consistent.


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---