Reverted the Default null case according to the comments
diff --git a/fey-core/src/main/scala/org/apache/iota/fey/Ensemble.scala b/fey-core/src/main/scala/org/apache/iota/fey/Ensemble.scala
index 2ce13ff..0e075e3 100644
--- a/fey-core/src/main/scala/org/apache/iota/fey/Ensemble.scala
+++ b/fey-core/src/main/scala/org/apache/iota/fey/Ensemble.scala
@@ -33,7 +33,6 @@
import Ensemble._
val monitoring_actor = FEY_MONITOR.actorRef
- val DEFAULT_NULL = null
var performers_metadata: Map[String, Performer] = Map.empty[String, Performer]
var connectors: Map[String,Array[String]] = Map.empty[String,Array[String]]
var performer: Map[String,ActorRef] = Map.empty[String,ActorRef]
@@ -164,13 +163,13 @@
*/
private def createFeyActor(performerID: String, connectionIDs: Array[String], tmpActors:HashMap[String, ActorRef]):(String, ActorRef) = {
if(!tmpActors.contains(performerID)){
- val performerInfo = performers_metadata.getOrElse(performerID, DEFAULT_NULL)
+ val performerInfo = performers_metadata.getOrElse(performerID, null)
if (Option(performerInfo).isDefined) {
val connections: Map[String, ActorRef] = connectionIDs.map(connID => {
createFeyActor(connID, connectors.getOrElse(connID,Array.empty),tmpActors)
}).toMap
- var actor: ActorRef = DEFAULT_NULL
+ var actor: ActorRef = null
val actorProps = getPerformer(performerInfo, connections)
if(performerInfo.autoScale) {
diff --git a/fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala b/fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala
index dd83ce1..970a99f 100644
--- a/fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala
+++ b/fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala
@@ -44,14 +44,13 @@
extends Actor with ActorLogging{
- val DEFAULT_NULL = null
import FeyGenericActor._
/**
* Keeps reference to the cancellable
*/
- @volatile private var scheduler: Cancellable = DEFAULT_NULL
+ @volatile private var scheduler: Cancellable = null
@volatile private var endBackoff: Long = 0
private[fey] val monitoring_actor = FEY_MONITOR.actorRef
@@ -114,7 +113,7 @@
private final def stopScheduler() = {
if (Option(scheduler).isDefined) {
scheduler.cancel()
- scheduler = DEFAULT_NULL
+ scheduler = null
}
}
/**
diff --git a/fey-core/src/main/scala/org/apache/iota/fey/TrieNode.scala b/fey-core/src/main/scala/org/apache/iota/fey/TrieNode.scala
index 5afd3ee..902e5f2 100644
--- a/fey-core/src/main/scala/org/apache/iota/fey/TrieNode.scala
+++ b/fey-core/src/main/scala/org/apache/iota/fey/TrieNode.scala
@@ -29,12 +29,10 @@
protected class Trie(systemName: String){
- val DEFAULT_NULL = null
-
private val root: TrieNode = TrieNode(systemName, ArrayBuffer.empty, ArrayBuffer.empty)
var elements: Int = 0
- def append(path: String, event: Monitor.MonitorEvent = DEFAULT_NULL): Unit = {
+ def append(path: String, event: Monitor.MonitorEvent = null): Unit = {
append(path.replaceFirst("akka://","").split("/"),root,1,event)
}
@@ -101,11 +99,11 @@
}
def print:JsValue = {
- getObject(root, DEFAULT_NULL)
+ getObject(root, null)
}
def printWithEvents:JsValue = {
- getObjectEvent(root, DEFAULT_NULL)
+ getObjectEvent(root, null)
}
def getRootChildren():ArrayBuffer[TrieNode] = {
diff --git a/performers/zmq/src/main/scala/org/apache/iota/fey/performer/ZMQPublisher.scala b/performers/zmq/src/main/scala/org/apache/iota/fey/performer/ZMQPublisher.scala
index 0f19aa0..856f91c 100644
--- a/performers/zmq/src/main/scala/org/apache/iota/fey/performer/ZMQPublisher.scala
+++ b/performers/zmq/src/main/scala/org/apache/iota/fey/performer/ZMQPublisher.scala
@@ -33,16 +33,14 @@
//-------default params----------
val DEFAULT_PORT = 5559
- val DEFAULT_NULL = null
-
var port: Int = DEFAULT_PORT
var target: String = "localhost"
val DEFAULT_LINGER = 200
val DEFAULT_HMW = 10
//-------class vars-------------------
- var ctx: ZMQ.Context = DEFAULT_NULL
- var pub: ZMQ.Socket = DEFAULT_NULL
+ var ctx: ZMQ.Context = null
+ var pub: ZMQ.Socket = null
var count: Int = 0
override def onStart: Unit = {
diff --git a/performers/zmq/src/main/scala/org/apache/iota/fey/performer/ZMQSubscriber.scala b/performers/zmq/src/main/scala/org/apache/iota/fey/performer/ZMQSubscriber.scala
index 7e51980..299c59e 100644
--- a/performers/zmq/src/main/scala/org/apache/iota/fey/performer/ZMQSubscriber.scala
+++ b/performers/zmq/src/main/scala/org/apache/iota/fey/performer/ZMQSubscriber.scala
@@ -32,14 +32,13 @@
//-------default params----------
val DEFAULT_PORT = 5563
- val DEFAULT_NULL = null
var port: Int = DEFAULT_PORT
var target: String = "localhost"
val topic_filter: String = "DATA"
//-------class vars-------------------
- var ctx: ZMQ.Context = DEFAULT_NULL
- var pub: ZMQ.Socket = DEFAULT_NULL
+ var ctx: ZMQ.Context = null
+ var pub: ZMQ.Socket = null
var count: Int = 0
override def onStart: Unit = {
@@ -70,8 +69,8 @@
pub.disconnect("tcp://" + target + ":" + port)
pub.close()
ctx.close()
- pub = DEFAULT_NULL
- ctx = DEFAULT_NULL
+ pub = null
+ ctx = null
}
override def onRestart(reason: Throwable): Unit = {
