Revision: 16267
Author: oleg.kulikoff
Date: Sat Jan 8 05:35:12 2011
Log: Restored after failure
http://code.google.com/p/mobicents/source/detail?r=16267
Modified:
/trunk/servers/media/core/controllers/mgcp
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/EventBuffer.java
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutor.java
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutors.java
=======================================
---
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/EventBuffer.java
Sat Jan 8 01:33:59 2011
+++
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/EventBuffer.java
Sat Jan 8 05:35:12 2011
@@ -121,7 +121,7 @@
sequence += s;
//check pattern matching for the single symbol
- if (patterns != null) {
+/* if (patterns != null) {
for (int i = 0; i < patterns.length; i++) {
if (s.matches(patterns[i])) {
listener.patternMatches(i, sequence);
@@ -132,7 +132,7 @@
}
}
}
-
+*/
//check pattern matching for the entire sequence
if (patterns != null && sequence.length() > 0) {
for (int i = 0; i < patterns.length; i++) {
=======================================
---
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutor.java
Sat Jan 8 01:33:59 2011
+++
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutor.java
Sat Jan 8 05:35:12 2011
@@ -161,6 +161,9 @@
}
public void recycle() {
+ for (SignalExecutor exec : executors) {
+ exec.reset();
+ }
pool.recycle(this);
}
/**
=======================================
---
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutors.java
Sat Jan 8 01:33:59 2011
+++
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutors.java
Sat Jan 8 05:35:12 2011
@@ -47,6 +47,7 @@
* @return first unused executor.
*/
public RequestExecutor poll() throws Exception {
+ logger.info("Polling, size= " + pool.size());
if (pool.size() > 0) {
RequestExecutor re = pool.remove(0);
logger.info("Return " + re);
@@ -65,7 +66,7 @@
* @param executor the executor to be recycled.
*/
protected void recycle(RequestExecutor executor) {
- logger.info("Recycled " + executor);
this.pool.add(executor);
+ logger.info("Recycled " + executor + " size=" + pool.size());
}
}