iota-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tonyfaust...@apache.org
Subject [28/31] incubator-iota git commit: Resolved error for FeyGenericActor
Date Tue, 29 Nov 2016 23:29:27 GMT
Resolved error for FeyGenericActor


Project: http://git-wip-us.apache.org/repos/asf/incubator-iota/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-iota/commit/79118216
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/79118216
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/79118216

Branch: refs/heads/master
Commit: 79118216c3f282a3019d3db3dda813cd58563215
Parents: e96b066
Author: Shivansh <shiv4nsh@gmail.com>
Authored: Tue Nov 22 15:24:21 2016 +0530
Committer: Shivansh <shiv4nsh@gmail.com>
Committed: Tue Nov 22 15:24:21 2016 +0530

----------------------------------------------------------------------
 fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala | 2 +-
 fey-core/src/test/scala/org/apache/iota/fey/MonitorSpec.scala     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/79118216/fey-core/src/main/scala/org/apache/iota/fey/FeyGenericActor.scala
----------------------------------------------------------------------
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 d5be525..5114c95 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
@@ -113,7 +113,7 @@ abstract class FeyGenericActor(val params: Map[String,String] = Map.empty,
   private final def stopScheduler() = {
     if (scheduler.isDefined) {
       scheduler.get.cancel()
-      scheduler = null
+      scheduler = None
     }
   }
   /**

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/79118216/fey-core/src/test/scala/org/apache/iota/fey/MonitorSpec.scala
----------------------------------------------------------------------
diff --git a/fey-core/src/test/scala/org/apache/iota/fey/MonitorSpec.scala b/fey-core/src/test/scala/org/apache/iota/fey/MonitorSpec.scala
index 3008518..43499ef 100644
--- a/fey-core/src/test/scala/org/apache/iota/fey/MonitorSpec.scala
+++ b/fey-core/src/test/scala/org/apache/iota/fey/MonitorSpec.scala
@@ -122,7 +122,7 @@ class MonitorSpec extends BaseAkkaSpec{
     }
     "result in logging error when throwable is specified" in {
       EventFilter[IllegalArgumentException](occurrences = 1) intercept {
-        monitorRef.underlyingActor.logInfo("path", "STOP", 1, "info", new IllegalArgumentException("Test"))
+        monitorRef.underlyingActor.logInfo("path", "STOP", 1, "info", Option(new IllegalArgumentException("Test")))
       }
     }
   }


Mime
View raw message