Index: lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
===================================================================
diff -u -rd9653595fbb52e47a56519a3eb6bc5f58cf307fe -ra2af9f04968a74dff35896c0ab309a35a1bbe100
--- lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java	(.../EtherpadService.java)	(revision d9653595fbb52e47a56519a3eb6bc5f58cf307fe)
+++ lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java	(.../EtherpadService.java)	(revision a2af9f04968a74dff35896c0ab309a35a1bbe100)
@@ -20,8 +20,6 @@
 
 public class EtherpadService implements IEtherpadService {
 
-    private EPLiteClient client = null;
-
     @SuppressWarnings("unchecked")
     @Override
     public Map<String, Object> createPad(String groupIdentifier) throws EtherpadException {
@@ -65,18 +63,15 @@
 
     @Override
     public EPLiteClient getClient() throws EtherpadException {
-	if (client == null) {
-	    // get the API key from the configuration and create EPLiteClient using it
-	    String etherpadServerUrl = Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL);
-	    String etherpadApiKey = Configuration.get(ConfigurationKeys.ETHERPAD_API_KEY);
-	    if (StringUtils.isBlank(etherpadServerUrl) || StringUtils.isBlank(etherpadApiKey)) {
-		throw new EtherpadException("Etherpad is not configured in sysadmin console");
-	    }
-
-	    // create EPLiteClient
-	    client = new EPLiteClient(etherpadServerUrl, etherpadApiKey);
+	// get the API key from the configuration and create EPLiteClient using it
+	String etherpadServerUrl = Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL);
+	String etherpadApiKey = Configuration.get(ConfigurationKeys.ETHERPAD_API_KEY);
+	if (StringUtils.isBlank(etherpadServerUrl) || StringUtils.isBlank(etherpadApiKey)) {
+	    throw new EtherpadException("Etherpad is not configured in sysadmin console");
 	}
-	return client;
+
+	// create EPLiteClient
+	return new EPLiteClient(etherpadServerUrl, etherpadApiKey);
     }
 
     /**