You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/01/31 13:26:22 UTC
svn commit: r1563124 - in /openmeetings:
branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
Author: solomax
Date: Fri Jan 31 12:26:22 2014
New Revision: 1563124
URL: http://svn.apache.org/r1563124
Log:
[OPENMEETINGS-898] client time zone is determined based on browser as expected
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1563124&r1=1563123&r2=1563124&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java Fri Jan 31 12:26:22 2014
@@ -385,6 +385,7 @@ public class WebSession extends Abstract
}
public String getClientTimeZone() {
+ TimeZone _zone = browserTz;
if (browserTz == null) {
try {
browserTz = getClientInfo().getProperties().getTimeZone();
@@ -400,11 +401,12 @@ public class WebSession extends Abstract
}
}
}
+ _zone = browserTz;
} catch (Exception e) {
- browserTz = Calendar.getInstance(getBrowserLocale()).getTimeZone();
+ _zone = Calendar.getInstance(getBrowserLocale()).getTimeZone();
}
}
- return browserTz == null ? null : browserTz.getID();
+ return _zone == null ? null : _zone.getID();
}
private void initDashboard() {
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1563124&r1=1563123&r2=1563124&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java Fri Jan 31 12:26:22 2014
@@ -385,6 +385,7 @@ public class WebSession extends Abstract
}
public String getClientTimeZone() {
+ TimeZone _zone = browserTz;
if (browserTz == null) {
try {
browserTz = getClientInfo().getProperties().getTimeZone();
@@ -400,11 +401,12 @@ public class WebSession extends Abstract
}
}
}
+ _zone = browserTz;
} catch (Exception e) {
- browserTz = Calendar.getInstance(getBrowserLocale()).getTimeZone();
+ _zone = Calendar.getInstance(getBrowserLocale()).getTimeZone();
}
}
- return browserTz == null ? null : browserTz.getID();
+ return _zone == null ? null : _zone.getID();
}
private void initDashboard() {