Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9baf82320488e653a83d6aa179fd01dc707ef10d
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 9baf82320488e653a83d6aa179fd01dc707ef10d)
@@ -1,7 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <script type="text/javascript">
-
 	$(window).load(function(){
 		$("#leaderSelectionDialog").modal({
 			show: ${isSelectLeaderActive},
@@ -25,54 +24,57 @@
     	document.getElementById("finishButton").disabled = true;
 		location.href = '<c:url value="/learning.do"/>?dispatch=finishActivity&toolSessionID=${toolSessionID}';
     }
-    
- 	//init the connection with server using server URL but with different protocol
- 	var leaderWebsocketInitTime = Date.now(),
- 		leaderWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
- 			+ 'learningWebsocket?toolSessionID=' + ${toolSessionID}),
-		leaderWebsocketPingTimeout = null,
-		leaderWebsocketPingFunc = null;
- 	
- 	leaderWebsocket.onclose = function(e){
- 		// react only on abnormal close
- 		if (e.code === 1006 &&
- 		 	Date.now() - leaderWebsocketInitTime > 1000) {
- 	 		location.reload();
- 		}
- 	};
- 	
-	leaderWebsocketPingFunc = function(skipPing){
-		if (leaderWebsocket.readyState == leaderWebsocket.CLOSING 
-				|| leaderWebsocket.readyState == leaderWebsocket.CLOSED){
-			return;
-		}
-		
-		// check and ping every 3 minutes
-		leaderWebsocketPingTimeout = setTimeout(leaderWebsocketPingFunc, 3*60*1000);
-		// initial set up does not send ping
-		if (!skipPing) {
-			leaderWebsocket.send("ping");
-		}
-	};
-	
-	// set up timer for the first time
-	leaderWebsocketPingFunc(true);
 
- 	
-	// run when the leader has just been selected
-	leaderWebsocket.onmessage = function(e) {
-		// no need to reset ping timer as the only possible message is page refresh
+    <%-- Init websocket only if group leader is not chosen --%>
+    <c:if test="${empty groupLeader}">
+	 	//init the connection with server using server URL but with different protocol
+	 	var leaderWebsocketInitTime = Date.now(),
+	 		leaderWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
+	 			+ 'learningWebsocket?toolSessionID=' + ${toolSessionID}),
+			leaderWebsocketPingTimeout = null,
+			leaderWebsocketPingFunc = null;
+	 	
+	 	leaderWebsocket.onclose = function(e){
+	 		// react only on abnormal close
+	 		if (e.code === 1006 &&
+	 		 	Date.now() - leaderWebsocketInitTime > 1000) {
+	 	 		location.reload();
+	 		}
+	 	};
+	 	
+		leaderWebsocketPingFunc = function(skipPing){
+			if (leaderWebsocket.readyState == leaderWebsocket.CLOSING 
+					|| leaderWebsocket.readyState == leaderWebsocket.CLOSED){
+				return;
+			}
+			
+			// check and ping every 3 minutes
+			leaderWebsocketPingTimeout = setTimeout(leaderWebsocketPingFunc, 3*60*1000);
+			// initial set up does not send ping
+			if (!skipPing) {
+				leaderWebsocket.send("ping");
+			}
+		};
 		
-		// create JSON object
-		var input = JSON.parse(e.data);
-		
-		// The leader has just been selected and all non-leaders should refresh their pages in order
-     	// to see new leader's name and a Finish button.
-		if (input.pageRefresh) {
-			location.reload();
-			return;
-		}
-	};
+		// set up timer for the first time
+		leaderWebsocketPingFunc(true);
+	
+	 	
+		// run when the leader has just been selected
+		leaderWebsocket.onmessage = function(e) {
+			// no need to reset ping timer as the only possible message is page refresh
+			
+			// create JSON object
+			var input = JSON.parse(e.data);
+			
+			// The leader has just been selected and all non-leaders should refresh their pages in order
+	     	// to see new leader's name and a Finish button.
+			if (input.pageRefresh) {
+				location.reload();
+				return;
+			}
+		};
+	</c:if>
 </script>
 
 <lams:Page type="learner" title="${content.title}">