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 2015/10/28 13:30:49 UTC

svn commit: r1710999 - in /openmeetings: branches/3.0.x/src/util/java/org/apache/openmeetings/util/CalendarHelper.java trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java

Author: solomax
Date: Wed Oct 28 12:30:49 2015
New Revision: 1710999

URL: http://svn.apache.org/viewvc?rev=1710999&view=rev
Log:
[OPENMEETINGS-1269] IST tz handled as expected

Modified:
    openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/CalendarHelper.java
    openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java

Modified: openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/CalendarHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/CalendarHelper.java?rev=1710999&r1=1710998&r2=1710999&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/CalendarHelper.java (original)
+++ openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/CalendarHelper.java Wed Oct 28 12:30:49 2015
@@ -28,7 +28,7 @@ import org.threeten.bp.ZonedDateTime;
 
 public class CalendarHelper {
 	public static ZoneId getZoneId(String tzId) {
-		return ZoneId.of(tzId);
+		return ZoneId.of(tzId, ZoneId.SHORT_IDS);
 	}
 	
 	public static Date getDate(LocalDate d, String tzId) {

Modified: openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java?rev=1710999&r1=1710998&r2=1710999&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java Wed Oct 28 12:30:49 2015
@@ -28,7 +28,7 @@ import org.threeten.bp.ZonedDateTime;
 
 public class CalendarHelper {
 	public static ZoneId getZoneId(String tzId) {
-		return ZoneId.of(tzId);
+		return ZoneId.of(tzId, ZoneId.SHORT_IDS);
 	}
 	
 	public static Date getDate(LocalDate d, String tzId) {