You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/16 18:08:37 UTC
svn commit: r1326667 -
/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
Author: sebawagner
Date: Mon Apr 16 16:08:37 2012
New Revision: 1326667
URL: http://svn.apache.org/viewvc?rev=1326667&view=rev
Log:
OPENMEETINGS-176 Import of Backup from version 1.9.x fails to import conference rooms
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1326667&r1=1326666&r2=1326667&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java Mon Apr 16 16:08:37 2012
@@ -1817,22 +1817,57 @@ public class BackupImportController exte
.element("externalRoomType").getText());
Long roomtypes_id = importLongType(unformatString(roomObject
.element("roomtypeId").getText()));
- Boolean isDemoRoom = importBooleanType(unformatString(roomObject
+
+ Boolean isDemoRoom = false;
+ if (roomObject
+ .element("isDemoRoom") != null) {
+ isDemoRoom = importBooleanType(unformatString(roomObject
.element("isDemoRoom").getText()));
- Integer demoTime = importIntegerType(unformatString(roomObject
+ }
+
+ Integer demoTime = null;
+ if (roomObject
+ .element("demoTime") != null) {
+ demoTime = importIntegerType(unformatString(roomObject
.element("demoTime").getText()));
- Boolean isModeratedRoom = importBooleanType(unformatString(roomObject
+ }
+
+ Boolean isModeratedRoom = false;
+ if (roomObject.element("isModeratedRoom") != null) {
+ isModeratedRoom = importBooleanType(unformatString(roomObject
.element("isModeratedRoom").getText()));
- Boolean allowUserQuestions = importBooleanType(unformatString(roomObject
+ }
+
+ Boolean allowUserQuestions = true;
+ if (roomObject.element("allowUserQuestions") != null) {
+ allowUserQuestions = importBooleanType(unformatString(roomObject
.element("allowUserQuestions").getText()));
- Boolean isAudioOnly = importBooleanType(unformatString(roomObject
+ }
+
+
+ Boolean isAudioOnly = false;
+ if (roomObject.element("isAudioOnly") != null) {
+ isAudioOnly = importBooleanType(unformatString(roomObject
.element("isAudioOnly").getText()));
- String sipNumber = unformatString(roomObject.element(
+ }
+
+ String sipNumber = "";
+ if (roomObject.element("sipNumber") != null) {
+ sipNumber = unformatString(roomObject.element(
"sipNumber").getText());
- String conferencePin = unformatString(roomObject
- .element("conferencePin").getText());
- Boolean showMicrophoneStatus = importBooleanType(unformatString(roomObject
- .element("showMicrophoneStatus").getText()));
+ }
+
+ String conferencePin = "";
+ if (roomObject.element("conferencePin") != null) {
+ conferencePin = unformatString(roomObject
+ .element("conferencePin").getText());
+ }
+
+ Boolean showMicrophoneStatus = false;
+ if (roomObject.element("showMicrophoneStatus") != null) {
+ showMicrophoneStatus = importBooleanType(unformatString(roomObject
+ .element("showMicrophoneStatus").getText()));
+ }
Long ownerId = null;
if (roomObject.element("ownerid") != null) {