Re: svn commit: r1824889 - /ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java

[Michael Brohl-3]

Jacques,

you reverted useful changes/refactorings, I do not see why this was
reverted now?

r1824807 was a different change (a missing import) which is not reverted
(and should not be because it is related to these changes).

Please revert this revert.

Jacques, I kindly ask you to slow down a bit. Sometimes less is more...

Thanks,

Michael


Am 20.02.18 um 16:17 schrieb [hidden email]:

> Author: jleroux
> Date: Tue Feb 20 15:17:04 2018
> New Revision: 1824889
>
> URL: http://svn.apache.org/viewvc?rev=1824889&view=rev
> Log:
> Reverts r1824807 by getting back to initial situation before r1811430
> It was my bad to no see that when it was automatically merged
>
> Modified:
>      ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>
> Modified: ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1824889&r1=1824888&r2=1824889&view=diff
> ==============================================================================
> --- ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java (original)
> +++ ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Tue Feb 20 15:17:04 2018
> @@ -24,7 +24,6 @@ import java.math.BigInteger;
>   import java.security.cert.X509Certificate;
>   import java.sql.Timestamp;
>   import java.util.ArrayList;
> -import java.util.Arrays;
>   import java.util.Collection;
>   import java.util.LinkedList;
>   import java.util.List;
> @@ -828,9 +827,7 @@ public static String autoLogoutCleanCook
>           HttpSession session = request.getSession();
>  
>           Cookie[] cookies = request.getCookies();
> -        if (Debug.verboseOn()) {
> -            Debug.logVerbose("Cookies: " + Arrays.toString(cookies), module);
> -        }
> +        if (Debug.verboseOn()) Debug.logVerbose("Cookies:" + cookies, module);
>           if (cookies != null && userLogin != null) {
>               for (Cookie autoLoginCookie: cookies) {
>                   String autoLoginName = autoLoginCookie.getName().replace(".autoUserLoginId", "");
>
>

[taher]

It might be useful to relax and take a little break Jacques since you
mentioned in another thread that you're having a bit of a rough day.
It might not be a great idea to code when you are in a sour mood. I
suggest to just revert this and come back to it later when you feel
refreshed.

On Tue, Feb 20, 2018 at 6:42 PM, Michael Brohl <[hidden email]> wrote:

> Jacques,
>
> you reverted useful changes/refactorings, I do not see why this was reverted
> now?
>
> r1824807 was a different change (a missing import) which is not reverted
> (and should not be because it is related to these changes).
>
> Please revert this revert.
>
> Jacques, I kindly ask you to slow down a bit. Sometimes less is more...
>
> Thanks,
>
> Michael
>
>
> Am 20.02.18 um 16:17 schrieb [hidden email]:
>
>> Author: jleroux
>> Date: Tue Feb 20 15:17:04 2018
>> New Revision: 1824889
>>
>> URL: http://svn.apache.org/viewvc?rev=1824889&view=rev
>> Log:
>> Reverts r1824807 by getting back to initial situation before r1811430
>> It was my bad to no see that when it was automatically merged
>>
>> Modified:
>>
>> ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>
>> Modified:
>> ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1824889&r1=1824888&r2=1824889&view=diff
>>
>> ==============================================================================
>> ---
>> ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>> (original)
>> +++
>> ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>> Tue Feb 20 15:17:04 2018
>> @@ -24,7 +24,6 @@ import java.math.BigInteger;
>>   import java.security.cert.X509Certificate;
>>   import java.sql.Timestamp;
>>   import java.util.ArrayList;
>> -import java.util.Arrays;
>>   import java.util.Collection;
>>   import java.util.LinkedList;
>>   import java.util.List;
>> @@ -828,9 +827,7 @@ public static String autoLogoutCleanCook
>>           HttpSession session = request.getSession();
>>             Cookie[] cookies = request.getCookies();
>> -        if (Debug.verboseOn()) {
>> -            Debug.logVerbose("Cookies: " + Arrays.toString(cookies),
>> module);
>> -        }
>> +        if (Debug.verboseOn()) Debug.logVerbose("Cookies:" + cookies,
>> module);
>>           if (cookies != null && userLogin != null) {
>>               for (Cookie autoLoginCookie: cookies) {
>>                   String autoLoginName =
>> autoLoginCookie.getName().replace(".autoUserLoginId", "");
>>
>>
>
>

[Jacques Le Roux]

Michael, Taher,

This was not refactored in R16, I just made as it was before my commit previous commit

I don't remember well but I think I got a conflict that's why I put it back as it was.

You can check by yourself in svn history, there were no changes but mine in LoginWorker.java since Jacopo created the branch

Of course I kept the changes for OFBIZ-4959 because it's a bug fix. If you think that's wrong then we need to discuss that point.

We have the "[OFBIZ-4959] Logout do not remove autoLogin" thread for that

Jacques



Le 20/02/2018 à 17:03, Taher Alkhateeb a écrit :

> It might be useful to relax and take a little break Jacques since you
> mentioned in another thread that you're having a bit of a rough day.
> It might not be a great idea to code when you are in a sour mood. I
> suggest to just revert this and come back to it later when you feel
> refreshed.
>
> On Tue, Feb 20, 2018 at 6:42 PM, Michael Brohl <[hidden email]> wrote:
>> Jacques,
>>
>> you reverted useful changes/refactorings, I do not see why this was reverted
>> now?
>>
>> r1824807 was a different change (a missing import) which is not reverted
>> (and should not be because it is related to these changes).
>>
>> Please revert this revert.
>>
>> Jacques, I kindly ask you to slow down a bit. Sometimes less is more...
>>
>> Thanks,
>>
>> Michael
>>
>>
>> Am 20.02.18 um 16:17 schrieb [hidden email]:
>>
>>> Author: jleroux
>>> Date: Tue Feb 20 15:17:04 2018
>>> New Revision: 1824889
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1824889&view=rev
>>> Log:
>>> Reverts r1824807 by getting back to initial situation before r1811430
>>> It was my bad to no see that when it was automatically merged
>>>
>>> Modified:
>>>
>>> ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>>
>>> Modified:
>>> ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1824889&r1=1824888&r2=1824889&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>> (original)
>>> +++
>>> ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>> Tue Feb 20 15:17:04 2018
>>> @@ -24,7 +24,6 @@ import java.math.BigInteger;
>>>    import java.security.cert.X509Certificate;
>>>    import java.sql.Timestamp;
>>>    import java.util.ArrayList;
>>> -import java.util.Arrays;
>>>    import java.util.Collection;
>>>    import java.util.LinkedList;
>>>    import java.util.List;
>>> @@ -828,9 +827,7 @@ public static String autoLogoutCleanCook
>>>            HttpSession session = request.getSession();
>>>              Cookie[] cookies = request.getCookies();
>>> -        if (Debug.verboseOn()) {
>>> -            Debug.logVerbose("Cookies: " + Arrays.toString(cookies),
>>> module);
>>> -        }
>>> +        if (Debug.verboseOn()) Debug.logVerbose("Cookies:" + cookies,
>>> module);
>>>            if (cookies != null && userLogin != null) {
>>>                for (Cookie autoLoginCookie: cookies) {
>>>                    String autoLoginName =
>>> autoLoginCookie.getName().replace(".autoUserLoginId", "");
>>>
>>>
>>