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/12/25 11:41:16 UTC
svn commit: r1425734 - in
/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings:
data/conference/Roommanagement.java persistence/beans/rooms/Rooms.java
Author: solomax
Date: Tue Dec 25 10:41:16 2012
New Revision: 1425734
URL: http://svn.apache.org/viewvc?rev=1425734&view=rev
Log:
Chat: allowFontStyles is modified to be "boolean" (default == false) to prevent NPE
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1425734&r1=1425733&r2=1425734&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java Tue Dec 25 10:41:16 2012
@@ -1311,7 +1311,7 @@ public class Roommanagement {
String sipNumber = getSipNumber(rooms_id);
if (sipNumber == null) {
r.setMeetme(null);
- } else if (!sipNumber.equals(r.getMeetme().getConfno())) {
+ } else if (r.getMeetme() == null || !sipNumber.equals(r.getMeetme().getConfno())) {
r.setMeetme(new MeetMe());
r.getMeetme().setConfno(sipNumber);
r.getMeetme().setPin(conferencePin);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1425734&r1=1425733&r2=1425734&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java Tue Dec 25 10:41:16 2012
@@ -134,9 +134,9 @@ public class Rooms implements Serializab
@Element(data = true, required = false)
private Boolean isAudioOnly;
- @Column(name = "allow_font_styles")
+ @Column(name = "allow_font_styles", nullable = false)
@Element(data = true, required = false)
- private Boolean allowFontStyles;
+ private boolean allowFontStyles = false;
@Column(name = "is_closed")
@Element(data = true, required = false)
@@ -373,11 +373,11 @@ public class Rooms implements Serializab
this.isAudioOnly = isAudioOnly;
}
- public Boolean getAllowFontStyles() {
+ public boolean getAllowFontStyles() {
return allowFontStyles;
}
- public void setAllowFontStyles(Boolean allowFontStyles) {
+ public void setAllowFontStyles(boolean allowFontStyles) {
this.allowFontStyles = allowFontStyles;
}