Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

prolanpw · Nov 8, 2013 · 0d50884 · 0d50884
2 parents b12188f + a58120f
commit 0d50884
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
@@ -29,12 +29,12 @@
 import org.apache.commons.lang.RandomStringUtils;
 
 public class Meeting {
-	private static final int MILLIS_IN_A_MINUTE = 60000;
+	private static final long MILLIS_IN_A_MINUTE = 60000;
 
 	private String name;
 	private String extMeetingId;
 	private String intMeetingId;	
-	private int duration = 0;	 
+	private long duration = 0;	 
 	private long createdTime = 0;
 	private long startTime = 0;
 	private long endTime = 0;