Revision: d13b5024ebb6
Author: gvagenas <[email protected]>
Date: Mon Dec 10 12:22:06 2012
Log: Fixes issue 13
http://code.google.com/p/commtesting/source/detail?r=d13b5024ebb6&repo=mss-arquillian
Modified:
/mss-arquillian-mediaserver-extension/src/main/java/org/mobicents/arquillian/mss/mediaserver/extension/EmbeddedMediaserverImpl.java
/pom.xml
=======================================
---
/mss-arquillian-mediaserver-extension/src/main/java/org/mobicents/arquillian/mss/mediaserver/extension/EmbeddedMediaserverImpl.java
Sat Nov 17 09:11:51 2012
+++
/mss-arquillian-mediaserver-extension/src/main/java/org/mobicents/arquillian/mss/mediaserver/extension/EmbeddedMediaserverImpl.java
Mon Dec 10 12:22:06 2012
@@ -1,11 +1,10 @@
package org.mobicents.arquillian.mss.mediaserver.extension;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.log4j.Logger;
import org.mobicents.arquillian.mediaserver.api.EmbeddedMediaserver;
@@ -27,7 +26,11 @@
/**
* EmbeddedMediaserver can be used either with @Mediaserver annotation in
an Arquillian test or
- * outside simply by instantiating a new instance
+ * outside simply by instantiating a new instance.
+ *
+ * Based on
+ * Media Server Embedded Example:
+ *
http://code.google.com/p/mediaserver/source/browse/bootstrap/src/test/java/org/mobicents/media/server/test/RecordingTest.java
*
* @author <a href="mailto:[email protected]">George Vagenas</a>
*/
@@ -75,7 +78,8 @@
destroy();
//use default clock
clock = new DefaultClock();
- endpoints = Collections.synchronizedList(new
ArrayList<Endpoint>());
+ endpoints = new CopyOnWriteArrayList<Endpoint>();
+// Collections.synchronizedList(new
ArrayList<Endpoint>());
dspFactory = new DspFactoryImpl();
//create single thread scheduler
scheduler = new Scheduler();
@@ -162,7 +166,7 @@
@Override
public synchronized void installEndpoint(Endpoint endpoint) {
- server.install(endpoint);
+ server.install(endpoint,null);
endpoints.add(endpoint);
status = MediaserverStatus.CONFIGURED;
}
=======================================
--- /pom.xml Thu Nov 8 02:22:22 2012
+++ /pom.xml Mon Dec 10 12:22:06 2012
@@ -117,7 +117,7 @@
<version.mobicents.jain.sip.jboss4>1.2.0.FINAL</version.mobicents.jain.sip.jboss4>
<!-- Mediaserver -->
- <version.mediaserver>3.0.0.CR1</version.mediaserver>
+ <version.mediaserver>3.0.0.FINAL</version.mediaserver>
<!-- Jain SIP -->
<jain-sip-api.version>1.2</jain-sip-api.version>