svn commit: r1508927 - in /activemq/activemq-apollo/trunk: apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/ apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/ apollo-openwire/src/main/scala/org/apache/activemq/apollo/op...

[ch...@apache.org]

Author: chirino
Date: Wed Jul 31 15:31:26 2013
New Revision: 1508927

URL: http://svn.apache.org/r1508927
Log:
Expose an async_die method on the ProtocolHandler interface.

Modified:
    activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala
    activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala

Modified: activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala?rev=1508927&r1=1508926&r2=1508927&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala Wed Jul 31 15:31:26 2013
@@ -145,6 +145,8 @@ class AmqpProtocolHandler extends Protoc
     case x: Break =>
   }
 
+  def async_die(client_message:String) = async_die("system-error", client_message)
+
   private def die[T](error_code: String, msg: String, e: Throwable = null): T = {
     if (e != null) {
       connection_log.info(e, "AMQP connection '%s' error: %s", security_context.remote_address, msg, e)

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala?rev=1508927&r1=1508926&r2=1508927&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/AnyProtocol.scala Wed Jul 31 15:31:26 2013
@@ -138,7 +138,10 @@ class AnyProtocolHandler extends Protoco
   def session_id = null
   var config:DetectDTO = _
 
+  def async_die(client_message:String) = connection.stop(NOOP)
+
   override def on_transport_command(command: AnyRef) = {
+  def async_die(client_message:String) = connection.stop(NOOP)
 
     if (!command.isInstanceOf[ProtocolDetected]) {
       throw new ProtocolException("Expected a ProtocolDetected object");

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala?rev=1508927&r1=1508926&r2=1508927&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/Protocol.scala Wed Jul 31 15:31:26 2013
@@ -85,6 +85,8 @@ trait ProtocolHandler {
 
   def protocol:String
 
+  def async_die(client_message:String)
+
   def session_id: String
 
   var connection:BrokerConnection = null;

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala?rev=1508927&r1=1508926&r2=1508927&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/UdpProtocol.scala Wed Jul 31 15:31:26 2013
@@ -126,6 +126,7 @@ abstract class UdpProtocolHandler extend
   def protocol = "udp"
   var session_id:String = null
 
+  def async_die(client_message:String) = null
 
   var buffer_size = 640*1024
   var connection_log:Log = _

Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1508927&r1=1508926&r2=1508927&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Wed Jul 31 15:31:26 2013
@@ -375,12 +375,15 @@ class OpenwireProtocolHandler extends Pr
     }
   }
 
-  def async_die(msg: String, actual:Command=null):Unit = try {
+  def async_die(msg: String) = async_die(msg, null)
+
+  def async_die(msg: String, actual:Command):Unit = try {
     die(msg, actual)
   } catch {
     case x:Break=>
   }
 
+
   /**
    * A protocol error that cannot be recovered from. It results in the connections being terminated.
    */

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1508927&r1=1508926&r2=1508927&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala Wed Jul 31 15:31:26 2013
@@ -834,7 +834,9 @@ class StompProtocolHandler extends Proto
   class ProtocolException(msg:String) extends RuntimeException(msg)
   class Break extends RuntimeException
 
-  private def async_die(msg:String, e:Throwable=null) = try {
+  def async_die(msg:String) = async_die(msg, null)
+
+  private def async_die(msg:String, e:Throwable) = try {
     die(msg, e)
   } catch {
     case x:Break=>