svn commit: r1231861 - /incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java

[sebawagner]

Author: sebawagner
Date: Mon Jan 16 08:33:07 2012
New Revision: 1231861

URL: http://svn.apache.org/viewvc?rev=1231861&view=rev
Log:
Add check in BackupExport if there is a room assigned for the org_room 
(although this should not happen)

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1231861&r1=1231860&r2=1231861&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
 Mon Jan 16 08:33:07 2012
@@ -1394,8 +1394,12 @@ public class BackupExport {
                        
room_organisation.addElement("organisation_id").addCDATA(
                                        formatString(""
                                                        + 
roomOrg.getOrganisation().getOrganisation_id()));
-                       room_organisation.addElement("rooms_id").addCDATA(
-                                       formatString("" + 
roomOrg.getRoom().getRooms_id()));
+                       if (roomOrg.getRoom() != null) {
+                               
room_organisation.addElement("rooms_id").addCDATA(
+                                               formatString("" + 
roomOrg.getRoom().getRooms_id()));
+                       } else {
+                               
room_organisation.addElement("rooms_id").addCDATA("0");
+                       }
                        room_organisation.addElement("deleted").addCDATA(
                                        formatString("" + 
roomOrg.getDeleted()));