activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961104 - in /activemq/sandbox/activemq-apollo-actor/activemq-broker/src: main/scala/org/apache/activemq/apollo/broker/ test/scala/org/apache/activemq/apollo/broker/
Date Wed, 07 Jul 2010 03:57:10 GMT
Author: chirino
Date: Wed Jul  7 03:57:10 2010
New Revision: 961104

URL: http://svn.apache.org/viewvc?rev=961104&view=rev
Log:
fixing compile issue, cleaning up exceptions

Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala?rev=961104&r1=961103&r2=961104&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
Wed Jul  7 03:57:10 2010
@@ -153,20 +153,13 @@ class Connector(val broker:Broker) exten
 
 
   override def _stop(onCompleted:Runnable): Unit = {
-    val tracker = new LoggingTracker(toString, dispatchQueue)
-
-    // This odd usage of tracker is because we don't want
-    // to kill client connections until the server is
-    // stopped. Since the connections list could change between
-    // now and when the server actually stops.
-    val task = tracker.task(transportServer.toString)
     transportServer.stop(^{
+      val tracker = new LoggingTracker(toString, dispatchQueue)
       for (connection <- connections) {
         tracker.stop(connection)
       }
-      task.run
+      tracker.callback(onCompleted)
     })
-    tracker.callback(onCompleted)
   }
 
   /**

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala?rev=961104&r1=961103&r2=961104&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
Wed Jul  7 03:57:10 2010
@@ -83,7 +83,7 @@ class VirtualHost(val broker: Broker) ex
   var database:BrokerDatabase = new BrokerDatabase
   var transactionManager:TransactionManager = new TransactionManager
 
-  override def toString = "virtual-host: "+config.id
+  override def toString = if (config==null) "virtual-host" else "virtual-host: "+config.id
 
   /**
    * Validates and then applies the configuration.

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala?rev=961104&r1=961103&r2=961104&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/FunSuiteSupport.scala
Wed Jul  7 03:57:10 2010
@@ -40,7 +40,7 @@ abstract class FunSuiteSupport extends F
 
   def testName = _testName.get
 
-  protected override def runTest(testName: String, reporter: Reporter, stopper: Stopper,
configMap: Map[String, Any], tracker: Tracker) = {
+  protected override def runTest(testName: String, reporter: org.scalatest.Reporter, stopper:
Stopper, configMap: Map[String, Any], tracker: Tracker) = {
     _testName.set(testName)
     try {
       super.runTest(testName, reporter, stopper, configMap, tracker)



Mime
View raw message