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 2012/10/02 18:15:32 UTC

svn commit: r1393006 - /incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java

Author: solomax
Date: Tue Oct  2 16:15:32 2012
New Revision: 1393006

URL: http://svn.apache.org/viewvc?rev=1393006&view=rev
Log:
Invitation is corrected to set valid date

Modified:
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java?rev=1393006&r1=1393005&r2=1393006&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java Tue Oct  2 16:15:32 2012
@@ -112,15 +112,23 @@ public class InvitationService implement
 				omTimeZone = omTimeZoneDaoImpl.getOmTimeZone(configurationDaoImpl.getConfValue("default.timezone", String.class, "Europe/Berlin"));
 			}
 
+			Calendar date = Calendar.getInstance();
+			date.setTime(validFromDate);
+			
 			String timeZoneName = omTimeZone.getIcal();
 			Calendar calFrom = Calendar.getInstance(TimeZone.getTimeZone(timeZoneName));
-			calFrom.setTime(validFromDate);
+			calFrom.set(Calendar.YEAR, date.get(Calendar.YEAR));
+			calFrom.set(Calendar.MONTH, date.get(Calendar.MONTH));
+			calFrom.set(Calendar.DAY_OF_MONTH, date.get(Calendar.DAY_OF_MONTH));
 			calFrom.set(Calendar.HOUR_OF_DAY, validFromHour);
 			calFrom.set(Calendar.MINUTE, validFromMinute);
 			calFrom.set(Calendar.SECOND, 0);
 
+			date.setTime(validToDate);
 			Calendar calTo = Calendar.getInstance(TimeZone.getTimeZone(timeZoneName));
-			calTo.setTime(validToDate);
+			calTo.set(Calendar.YEAR, date.get(Calendar.YEAR));
+			calTo.set(Calendar.MONTH, date.get(Calendar.MONTH));
+			calTo.set(Calendar.DAY_OF_MONTH, date.get(Calendar.DAY_OF_MONTH));
 			calTo.set(Calendar.HOUR_OF_DAY, validToHour);
 			calTo.set(Calendar.MINUTE, validToMinute);
 			calTo.set(Calendar.SECOND, 0);