summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-07-24 17:30:23 +0000
committermichelou <michelou@epfl.ch>2007-07-24 17:30:23 +0000
commitd8504784b821fb64f411adf7c551ee4646e5f99c (patch)
tree73534241fb12d0b55970d9addc319dde9ebd6048 /src/actors
parent551e31ec7d1f3399cb1a0193f68268f292e96699 (diff)
downloadscala-d8504784b821fb64f411adf7c551ee4646e5f99c.tar.gz
scala-d8504784b821fb64f411adf7c551ee4646e5f99c.tar.bz2
scala-d8504784b821fb64f411adf7c551ee4646e5f99c.zip
added class scala.Random
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/remote/TcpService.scala16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/actors/scala/actors/remote/TcpService.scala b/src/actors/scala/actors/remote/TcpService.scala
index e40384749b..d9181f96b6 100644
--- a/src/actors/scala/actors/remote/TcpService.scala
+++ b/src/actors/scala/actors/remote/TcpService.scala
@@ -16,8 +16,6 @@ import java.lang.{Thread, SecurityException}
import java.io.{DataInputStream, DataOutputStream, IOException}
import java.net.{InetAddress, ServerSocket, Socket, UnknownHostException}
-import compat.Platform
-
import scala.collection.mutable.HashMap
/* Object TcpService.
@@ -26,9 +24,9 @@ import scala.collection.mutable.HashMap
* @author Philipp Haller
*/
object TcpService {
- val random = new java.util.Random(Platform.currentTime)
+ val random = new Random
- def generatePort: int = {
+ def generatePort: Int = {
var portnum = 0
try {
portnum = 8000 + random.nextInt(500)
@@ -47,7 +45,7 @@ object TcpService {
portnum
}
- var BufSize: int = 65536
+ var BufSize: Int = 65536
}
/* Class TcpService.
@@ -61,14 +59,14 @@ class TcpService(port: Int) extends Thread with Service {
private val internalNode = new Node(InetAddress.getLocalHost().getHostAddress(), port)
def node: Node = internalNode
- private val pendingSends = new HashMap[Node, List[Array[byte]]]
+ private val pendingSends = new HashMap[Node, List[Array[Byte]]]
/**
* Sends a byte array to another node on the network.
* If the node is not yet up, up to <code>TcpService.BufSize</code>
* messages are buffered.
*/
- def send(node: Node, data: Array[byte]): Unit = synchronized {
+ def send(node: Node, data: Array[Byte]): Unit = synchronized {
def bufferMsg(t: Throwable) = {
// buffer message, so that it can be re-sent
@@ -171,7 +169,7 @@ class TcpService(port: Int) extends Thread with Service {
}
}
- def isReachable(node: Node): boolean =
+ def isReachable(node: Node): Boolean =
if (isConnected(node)) true
else try {
connect(node)
@@ -212,7 +210,7 @@ class TcpServiceWorker(parent: TcpService, so: Socket) extends Thread {
}
}
- def transmit(data: Array[byte]): Unit = synchronized {
+ def transmit(data: Array[Byte]): Unit = synchronized {
Debug.info(this+": transmitting data...")
dataout.writeInt(data.length)
dataout.write(data)