Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5815/src/java/net/sf/asterisk/manager/impl
Modified Files:
ResponseBuilderImpl.java ManagerReaderImpl.java
Log Message:
Applied Daniel Pocock's patch to the manager:
- Added debugging
- Added access to the raw attributes of ManagerResponse
Index: ResponseBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/ResponseBuilderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- ResponseBuilderImpl.java 11 Mar 2005 15:27:23 -0000 1.1
+++ ResponseBuilderImpl.java 23 Apr 2005 22:56:29 -0000 1.2
@@ -16,6 +16,7 @@
*/
package net.sf.asterisk.manager.impl;
+import java.util.HashMap;
import java.util.Map;
import net.sf.asterisk.manager.ResponseBuilder;
@@ -103,6 +104,9 @@ public class ResponseBuilderImpl impleme
// fill known attributes
response.setResponse(responseType);
+ // clone this map as it is reused by the ManagerReader
+ response.setAttributes(new HashMap(attributes));
+
if (attributes.containsKey("actionid"))
{
response.setActionId((String) attributes.get("actionid"));
Index: ManagerReaderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/ManagerReaderImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- ManagerReaderImpl.java 15 Apr 2005 04:47:01 -0000 1.4
+++ ManagerReaderImpl.java 23 Apr 2005 22:56:31 -0000 1.5
@@ -159,6 +159,10 @@ public class ManagerReaderImpl implement
commandResponse.setResponse("Follows");
commandResponse.setDateReceived(DateUtil.getDate());
commandResponse.setResult(commandResult);
+ Map attributes = new HashMap();
+ attributes.put("actionid", commandResponse.getActionId());
+ attributes.put("response", commandResponse.getResponse());
+ commandResponse.setAttributes(attributes);
dispatcher.dispatchResponse(commandResponse);
processingCommandResult = false;
}
@@ -197,19 +201,28 @@ public class ManagerReaderImpl implement
if (buffer.containsKey("response"))
{
ManagerResponse response = buildResponse(buffer);
+ logger.debug("attempting to build response");
if (response != null)
{
dispatcher.dispatchResponse(response);
- }
+ }
}
else if (buffer.containsKey("event"))
{
+ logger.debug("attempting to build event: " + buffer.get("event"));
ManagerEvent event = buildEvent(asteriskServer, buffer);
if (event != null)
{
dispatcher.dispatchEvent(event);
+ } else
+ {
+ logger.warn("buildEvent returned null");
}
}
+ else
+ {
+ logger.warn("buffer contains neither response nor event");
+ }
buffer.clear();
}
@@ -227,6 +240,7 @@ public class ManagerReaderImpl implement
value = line.substring(delimiterIndex + 2);
buffer.put(name, value);
+ logger.debug("Got name [" + name + "], value: [" + value + "]");
}
}
}
|
