svn commit: r1738208 - /openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java

[solomax]

Author: solomax
Date: Fri Apr  8 04:59:24 2016
New Revision: 1738208

URL: http://svn.apache.org/viewvc?rev=1738208&view=rev
Log:
[OPENMEETINGS-1365] network testing tool works as expected

Modified:
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1738208&r1=1738207&r2=1738208&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
 Fri Apr  8 04:59:24 2016
@@ -152,7 +152,10 @@ public class RoomPanel extends BasePanel
                        //no-op
                }
                StringValue swfVal = pp.get("swf");
-               PageParameters spp = new PageParameters(pp).mergeWith(new 
PageParameters().add(WICKET_ROOM_ID, roomId));
+               PageParameters spp = new PageParameters(pp);
+               if (roomId != null) {
+                       spp.mergeWith(new PageParameters().add(WICKET_ROOM_ID, 
roomId));
+               }
                String swf = (swfVal.isEmpty() ? getFlashFile() : 
swfVal.toString())
                                + new 
PageParametersEncoder().encodePageParameters(spp);
                add(new Label("init", String.format("initSwf('%s');", 
swf)).setEscapeModelStrings(false));
@@ -169,7 +172,7 @@ public class RoomPanel extends BasePanel
                add(vote = new VoteDialog("vote", roomId));
                add(pollResults = new PollResultsDialog("pollResults", roomId));
                add(startSharing = new StartSharingEventBehavior(roomId));
-               if (roomId.longValue() > 0) {
+               if (roomId != null && roomId.longValue() > 0) {
                        add(new AbstractDefaultAjaxBehavior() {
                                private static final long serialVersionUID = 1L;