details: https://code.openbravo.com/erp/devel/pi/rev/f9c719fb7579
changeset: 22766:f9c719fb7579
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Mar 25 12:37:02 2014 +0100
summary: fixed issue 26081: AD_Session.WebSession column is not populated
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml | 4 ++--
src-db/database/sourcedata/AD_ELEMENT.xml | 4 ++--
src-db/database/sourcedata/AD_FIELD.xml | 4 ++--
src/org/openbravo/erpCommon/security/SessionLogin.java | 7 ++++++-
4 files changed, 12 insertions(+), 7 deletions(-)
diffs (73 lines):
diff -r afa0079db3ba -r f9c719fb7579 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Mar 25 12:18:20 2014 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Mar 25 12:37:02 2014 +0100
@@ -109488,8 +109488,8 @@
<!--8584--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--8584--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8584--> <NAME><![CDATA[Web Session]]></NAME>
-<!--8584--> <DESCRIPTION><![CDATA[Web Session ID]]></DESCRIPTION>
-<!--8584--> <HELP><![CDATA[Web Session identifier]]></HELP>
+<!--8584--> <DESCRIPTION><![CDATA[Tomcat Session ID]]></DESCRIPTION>
+<!--8584--> <HELP><![CDATA[Identifier assigned to the session by the Servlet
Container (Tomcat).]]></HELP>
<!--8584--> <COLUMNNAME><![CDATA[WebSession]]></COLUMNNAME>
<!--8584--> <AD_TABLE_ID><![CDATA[566]]></AD_TABLE_ID>
<!--8584--> <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
diff -r afa0079db3ba -r f9c719fb7579 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Tue Mar 25 12:18:20 2014 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Tue Mar 25 12:37:02 2014 +0100
@@ -11502,8 +11502,8 @@
<!--2059--> <COLUMNNAME><![CDATA[WebSession]]></COLUMNNAME>
<!--2059--> <NAME><![CDATA[Web Session]]></NAME>
<!--2059--> <PRINTNAME><![CDATA[Web Session]]></PRINTNAME>
-<!--2059--> <DESCRIPTION><![CDATA[Web Session ID]]></DESCRIPTION>
-<!--2059--> <HELP><![CDATA[Web Session identifier]]></HELP>
+<!--2059--> <DESCRIPTION><![CDATA[Tomcat Session ID]]></DESCRIPTION>
+<!--2059--> <HELP><![CDATA[Identifier assigned to the session by the Servlet
Container (Tomcat).]]></HELP>
<!--2059--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2059--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--2059--></AD_ELEMENT>
diff -r afa0079db3ba -r f9c719fb7579 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Tue Mar 25 12:18:20 2014 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Tue Mar 25 12:37:02 2014 +0100
@@ -79491,8 +79491,8 @@
<!--6620--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--6620--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--6620--> <NAME><![CDATA[Web Session]]></NAME>
-<!--6620--> <DESCRIPTION><![CDATA[Web Session ID]]></DESCRIPTION>
-<!--6620--> <HELP><![CDATA[Web Session identifier]]></HELP>
+<!--6620--> <DESCRIPTION><![CDATA[Tomcat Session ID]]></DESCRIPTION>
+<!--6620--> <HELP><![CDATA[Identifier assigned to the session by the Servlet
Container (Tomcat).]]></HELP>
<!--6620--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--6620--> <AD_TAB_ID><![CDATA[475]]></AD_TAB_ID>
<!--6620--> <AD_COLUMN_ID><![CDATA[8584]]></AD_COLUMN_ID>
diff -r afa0079db3ba -r f9c719fb7579
src/org/openbravo/erpCommon/security/SessionLogin.java
--- a/src/org/openbravo/erpCommon/security/SessionLogin.java Tue Mar 25
12:18:20 2014 +0100
+++ b/src/org/openbravo/erpCommon/security/SessionLogin.java Tue Mar 25
12:37:02 2014 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2010 Openbravo SLU
+ * All portions are Copyright (C) 2001-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -24,6 +24,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
import org.openbravo.base.provider.OBProvider;
@@ -101,6 +102,10 @@
private void defaultParameters(HttpServletRequest request) {
setRemoteAddr(request.getRemoteAddr());
setRemoteHost(request.getRemoteHost());
+ HttpSession requestSession = request.getSession(false);
+ if (requestSession != null) {
+ setWebSession(requestSession.getId());
+ }
if (log4j.isDebugEnabled())
log4j.debug("SessionLogin.defaultParameters(request) - Remote Address: "
+ getRemoteAddr()
+ " - Remote Host: " + getRemoteHost());
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
