svn commit: r1425733 - /incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java

[solomax]

Author: solomax
Date: Tue Dec 25 09:59:20 2012
New Revision: 1425733

URL: http://svn.apache.org/viewvc?rev=1425733&view=rev
Log:
Backup: NPE in single server environment while restoring from backup

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

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1425733&r1=1425732&r2=1425733&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
 Tue Dec 25 09:59:20 2012
@@ -2527,9 +2527,11 @@ public class ScopeApplicationAdapter ext
                                                "Could not Find RoomClient on 
List publicSID: "+ publicSID);
                        }
                        
-                       clusterSlaveJob.syncMessageToClientOnSlave(
-                                       
serverDao.get(clientSessionInfo.getServerId()), 
clientSessionInfo.getRcl().getPublicSID(), message);
-                       
+                       Server s = clientSessionInfo.getServerId() != null ? 
serverDao.get(clientSessionInfo.getServerId()) : null;
+                       if (s != null) {
+                               // no need to sync on slave if server is null
+                               clusterSlaveJob.syncMessageToClientOnSlave(s, 
clientSessionInfo.getRcl().getPublicSID() , message);
+                       }
                } catch (Exception err) {
                        log.error("[sendMessageWithClient] ", err);
                }