Changeset 258:0d701d87f3f4

Timestamp:

04/27/2010 10:50:35 AM (4 months ago)

Author:

dcaoyuan

Branch:

default

Message:

close serverChannel when stop it

Location:

blogbird/src/main/scala/org/aiotrade/httpd

Files:

• HttpdActors.scala (modified) (1 diff)
• coroutine/HttpdRoutines.scala (modified) (2 diffs)

blogbird/src/main/scala/org/aiotrade/httpd/HttpdActors.scala

@@ -21 +21 @@
 
   def stop {
-    connectionSelector.done = true
+    connectionSelector.stop
   }
 
   private object connectionSelector extends Actor {
-    var done = false
+    val serverChannel = ServerSocketChannel.open
+    serverChannel.socket.bind(new InetSocketAddress(localAddress, port))
+
+    def stop = {
+      serverChannel.close
+    }
     
     /**
-     * Opens the port and loops forever, emitting newly connected sockets.
+     * loops forever, emitting newly connected sockets.
      */
     def act {
-      val serverChannel = ServerSocketChannel.open
-      serverChannel.socket.bind(new InetSocketAddress(localAddress, port))
       serverChannel.configureBlocking(true)
-
-      while (!done) {
+      while (serverChannel.isOpen) {
         val clientChannel = serverChannel.accept
         if (clientChannel != null) {

blogbird/src/main/scala/org/aiotrade/httpd/coroutine/HttpdRoutines.scala

@@ -81 +81 @@
  */
 class PortListener(localAddress: InetAddress, port: Int) extends Producer[SocketChannel] {
-  private var done = false
-
-  def stop {
-    done = true
-  }
-
+  val serverChannel = ServerSocketChannel.open
+  serverChannel.socket.bind(new InetSocketAddress(localAddress, port))
+
+  def stop {
+    serverChannel.close
+  }
 
   private object connectionSelector extends Actor {
@@ -94 +94 @@
      */
     def act {
-      val serverChannel = ServerSocketChannel.open
-      serverChannel.socket.bind(new InetSocketAddress(localAddress, port))
       serverChannel.configureBlocking(true)
-
-      while (!done) {
+      while (serverChannel.isOpen) {
         val clientChannel = serverChannel.accept
         if (clientChannel != null) {