Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8381/src/java/net/sf/asterisk/manager/impl
Modified Files:
ManagerReaderImpl.java
Log Message:
Fixed detection of END COMMAND when sending a CommandAction that contains an error.
Index: ManagerReaderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/ManagerReaderImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- ManagerReaderImpl.java 7 Jun 2005 23:36:15 -0000 1.6
+++ ManagerReaderImpl.java 27 Jul 2005 19:06:18 -0000 1.7
@@ -142,7 +142,9 @@ public class ManagerReaderImpl implement
// enhanced.
if (processingCommandResult)
{
- if ("--END COMMAND--".equals(line))
+ // in case of an error Asterisk sends a Usage: and an END COMMAND
+ // that is prepended by a space :(
+ if ("--END COMMAND--".equals(line) || " --END COMMAND--".equals(line))
{
CommandResponse commandResponse = new CommandResponse();
@@ -150,7 +152,7 @@ public class ManagerReaderImpl implement
{
String[] crNVPair = ((String) commandResult.get(crIdx)).split(" *: *", 2);
- if (crNVPair[0].equals("ActionID"))
+ if (crNVPair[0].equalsIgnoreCase("ActionID"))
{
// Remove the command response nvpair from the
// command result array and decrement index so we
@@ -160,7 +162,7 @@ public class ManagerReaderImpl implement
// Register the action id with the command result
commandResponse.setActionId(crNVPair[1]);
}
- else if (crNVPair[0].equals("Privilege"))
+ else if (crNVPair[0].equalsIgnoreCase("Privilege"))
{
// Remove the command response nvpair from the
// command result array and decrement index so we
|
