You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2018/02/14 16:40:19 UTC
svn commit: r1824260 - in
/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control:
ExternalLoginKeysManager.java LoginWorker.java
Author: jleroux
Date: Wed Feb 14 16:40:19 2018
New Revision: 1824260
URL: http://svn.apache.org/viewvc?rev=1824260&view=rev
Log:
No functional change, removes TODOs that are OK
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java?rev=1824260&r1=1824259&r2=1824260&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java Wed Feb 14 16:40:19 2018
@@ -208,7 +208,7 @@ public class ExternalLoginKeysManager {
GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).queryOne();
if (userLogin != null) {
// Check it's the right tenant in case username and password are the same in different tenants
- // TODO : not sure this is really useful in the case of external server, should not hurt anyway
+ // Not sure this is really useful in the case of external server, should not hurt anyway
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
String oldDelegatorName = delegator.getDelegatorName();
ServletContext servletContext = session.getServletContext();
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1824260&r1=1824259&r2=1824260&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Wed Feb 14 16:40:19 2018
@@ -628,7 +628,6 @@ public class LoginWorker {
doBasicLogout(userLogin, request, response);
//autoLogoutFromAllBackendSessions(userLogin, request, response);
- // TODO check why, seems no sense
if (request.getAttribute("_AUTO_LOGIN_LOGOUT_") == null) {
return autoLoginCheck(request, response);
}
@@ -846,7 +845,7 @@ public class LoginWorker {
session.removeAttribute("autoUserLogin");
session.removeAttribute("autoName");
- request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE); // TODO check it's useful
+ request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE);
return "success";
}
Re: svn commit: r1824260 - in
/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbi
z/webapp/control: ExternalLoginKeysManager.java LoginWorker.java
Posted by Michael Brohl <mi...@ecomify.de>.
Hi Jacques,
if unsure, I would always use Improved:. As Scott mentioned earlier,
each commit should be at least an improvement to the codebase.
Thanks,
Michael
Am 15.02.18 um 08:48 schrieb Jacques Le Roux:
> Hi Michael,
>
> Actually these were commits I recently (1 week ago in r1823324) put to
> myself to quickly check.
>
> I could give this information in the commit log, would it help you?
>
> What would you use for action done, improvement? Maybe completed?
>
> Jacques
>
> Le 14/02/2018 à 20:45, Michael Brohl a écrit :
>> Jacques, please amend the commit message, thank you.
>> Regards,
>> Michael
>>
>>
>>
>>> Am 14.02.2018 um 17:40 schrieb jleroux@apache.org:
>>>
>>> Author: jleroux
>>> Date: Wed Feb 14 16:40:19 2018
>>> New Revision: 1824260
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1824260&view=rev
>>> Log:
>>> No functional change, removes TODOs that are OK
>>>
>>> Modified:
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>>
>>> Modified:
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java?rev=1824260&r1=1824259&r2=1824260&view=diff
>>> ==============================================================================
>>>
>>> ---
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
>>> (original)
>>> +++
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
>>> Wed Feb 14 16:40:19 2018
>>> @@ -208,7 +208,7 @@ public class ExternalLoginKeysManager {
>>> GenericValue userLogin =
>>> EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
>>> userLoginId).queryOne();
>>> if (userLogin != null) {
>>> // Check it's the right tenant in case username and
>>> password are the same in different tenants
>>> - // TODO : not sure this is really useful in the
>>> case of external server, should not hurt anyway
>>> + // Not sure this is really useful in the case of
>>> external server, should not hurt anyway
>>> LocalDispatcher dispatcher = (LocalDispatcher)
>>> request.getAttribute("dispatcher");
>>> String oldDelegatorName =
>>> delegator.getDelegatorName();
>>> ServletContext servletContext =
>>> session.getServletContext();
>>>
>>> Modified:
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1824260&r1=1824259&r2=1824260&view=diff
>>> ==============================================================================
>>>
>>> ---
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>> (original)
>>> +++
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>> Wed Feb 14 16:40:19 2018
>>> @@ -628,7 +628,6 @@ public class LoginWorker {
>>> doBasicLogout(userLogin, request, response);
>>>
>>> //autoLogoutFromAllBackendSessions(userLogin, request,
>>> response);
>>> - // TODO check why, seems no sense
>>> if (request.getAttribute("_AUTO_LOGIN_LOGOUT_") == null) {
>>> return autoLoginCheck(request, response);
>>> }
>>> @@ -846,7 +845,7 @@ public class LoginWorker {
>>> session.removeAttribute("autoUserLogin");
>>> session.removeAttribute("autoName");
>>>
>>> - request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE);
>>> // TODO check it's useful
>>> + request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE);
>>> return "success";
>>> }
>>>
>>>
>>>
>>
>
Re: svn commit: r1824260 - in
/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbi
z/webapp/control: ExternalLoginKeysManager.java LoginWorker.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
Ok done
Jacques
Le 15/02/2018 à 08:48, Jacques Le Roux a écrit :
> Hi Michael,
>
> Actually these were commits I recently (1 week ago in r1823324) put to myself to quickly check.
>
> I could give this information in the commit log, would it help you?
>
> What would you use for action done, improvement? Maybe completed?
>
> Jacques
>
> Le 14/02/2018 à 20:45, Michael Brohl a écrit :
>> Jacques, please amend the commit message, thank you.
>> Regards,
>> Michael
>>
>>
>>
>>> Am 14.02.2018 um 17:40 schrieb jleroux@apache.org:
>>>
>>> Author: jleroux
>>> Date: Wed Feb 14 16:40:19 2018
>>> New Revision: 1824260
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1824260&view=rev
>>> Log:
>>> No functional change, removes TODOs that are OK
>>>
>>> Modified:
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
>>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>>
>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java?rev=1824260&r1=1824259&r2=1824260&view=diff
>>> ==============================================================================
>>> --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java (original)
>>> +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java Wed Feb 14 16:40:19 2018
>>> @@ -208,7 +208,7 @@ public class ExternalLoginKeysManager {
>>> GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).queryOne();
>>> if (userLogin != null) {
>>> // Check it's the right tenant in case username and password are the same in different tenants
>>> - // TODO : not sure this is really useful in the case of external server, should not hurt anyway
>>> + // Not sure this is really useful in the case of external server, should not hurt anyway
>>> LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
>>> String oldDelegatorName = delegator.getDelegatorName();
>>> ServletContext servletContext = session.getServletContext();
>>>
>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1824260&r1=1824259&r2=1824260&view=diff
>>> ==============================================================================
>>> --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java (original)
>>> +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Wed Feb 14 16:40:19 2018
>>> @@ -628,7 +628,6 @@ public class LoginWorker {
>>> doBasicLogout(userLogin, request, response);
>>>
>>> //autoLogoutFromAllBackendSessions(userLogin, request, response);
>>> - // TODO check why, seems no sense
>>> if (request.getAttribute("_AUTO_LOGIN_LOGOUT_") == null) {
>>> return autoLoginCheck(request, response);
>>> }
>>> @@ -846,7 +845,7 @@ public class LoginWorker {
>>> session.removeAttribute("autoUserLogin");
>>> session.removeAttribute("autoName");
>>>
>>> - request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE); // TODO check it's useful
>>> + request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE);
>>> return "success";
>>> }
>>>
>>>
>>>
>>
>
>
Re: svn commit: r1824260 - in
/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbi
z/webapp/control: ExternalLoginKeysManager.java LoginWorker.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
Hi Michael,
Actually these were commits I recently (1 week ago in r1823324) put to myself to quickly check.
I could give this information in the commit log, would it help you?
What would you use for action done, improvement? Maybe completed?
Jacques
Le 14/02/2018 à 20:45, Michael Brohl a écrit :
> Jacques, please amend the commit message, thank you.
> Regards,
> Michael
>
>
>
>> Am 14.02.2018 um 17:40 schrieb jleroux@apache.org:
>>
>> Author: jleroux
>> Date: Wed Feb 14 16:40:19 2018
>> New Revision: 1824260
>>
>> URL: http://svn.apache.org/viewvc?rev=1824260&view=rev
>> Log:
>> No functional change, removes TODOs that are OK
>>
>> Modified:
>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
>> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>>
>> Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java?rev=1824260&r1=1824259&r2=1824260&view=diff
>> ==============================================================================
>> --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java (original)
>> +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java Wed Feb 14 16:40:19 2018
>> @@ -208,7 +208,7 @@ public class ExternalLoginKeysManager {
>> GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).queryOne();
>> if (userLogin != null) {
>> // Check it's the right tenant in case username and password are the same in different tenants
>> - // TODO : not sure this is really useful in the case of external server, should not hurt anyway
>> + // Not sure this is really useful in the case of external server, should not hurt anyway
>> LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
>> String oldDelegatorName = delegator.getDelegatorName();
>> ServletContext servletContext = session.getServletContext();
>>
>> Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1824260&r1=1824259&r2=1824260&view=diff
>> ==============================================================================
>> --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java (original)
>> +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Wed Feb 14 16:40:19 2018
>> @@ -628,7 +628,6 @@ public class LoginWorker {
>> doBasicLogout(userLogin, request, response);
>>
>> //autoLogoutFromAllBackendSessions(userLogin, request, response);
>> - // TODO check why, seems no sense
>> if (request.getAttribute("_AUTO_LOGIN_LOGOUT_") == null) {
>> return autoLoginCheck(request, response);
>> }
>> @@ -846,7 +845,7 @@ public class LoginWorker {
>> session.removeAttribute("autoUserLogin");
>> session.removeAttribute("autoName");
>>
>> - request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE); // TODO check it's useful
>> + request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE);
>> return "success";
>> }
>>
>>
>>
>
Re: svn commit: r1824260 - in
/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control:
ExternalLoginKeysManager.java LoginWorker.java
Posted by Michael Brohl <mi...@ecomify.de>.
Jacques, please amend the commit message, thank you.
Regards,
Michael
> Am 14.02.2018 um 17:40 schrieb jleroux@apache.org:
>
> Author: jleroux
> Date: Wed Feb 14 16:40:19 2018
> New Revision: 1824260
>
> URL: http://svn.apache.org/viewvc?rev=1824260&view=rev
> Log:
> No functional change, removes TODOs that are OK
>
> Modified:
> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
> ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java?rev=1824260&r1=1824259&r2=1824260&view=diff
> ==============================================================================
> --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java Wed Feb 14 16:40:19 2018
> @@ -208,7 +208,7 @@ public class ExternalLoginKeysManager {
> GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).queryOne();
> if (userLogin != null) {
> // Check it's the right tenant in case username and password are the same in different tenants
> - // TODO : not sure this is really useful in the case of external server, should not hurt anyway
> + // Not sure this is really useful in the case of external server, should not hurt anyway
> LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
> String oldDelegatorName = delegator.getDelegatorName();
> ServletContext servletContext = session.getServletContext();
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1824260&r1=1824259&r2=1824260&view=diff
> ==============================================================================
> --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Wed Feb 14 16:40:19 2018
> @@ -628,7 +628,6 @@ public class LoginWorker {
> doBasicLogout(userLogin, request, response);
>
> //autoLogoutFromAllBackendSessions(userLogin, request, response);
> - // TODO check why, seems no sense
> if (request.getAttribute("_AUTO_LOGIN_LOGOUT_") == null) {
> return autoLoginCheck(request, response);
> }
> @@ -846,7 +845,7 @@ public class LoginWorker {
> session.removeAttribute("autoUserLogin");
> session.removeAttribute("autoName");
>
> - request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE); // TODO check it's useful
> + request.setAttribute("_AUTO_LOGIN_LOGOUT_", Boolean.TRUE);
> return "success";
> }
>
>
>