Skip to content

Commit

Permalink
Fixed subscribing issue + converted Reader and Writer to trait + made…
Browse files Browse the repository at this point in the history
… host and port public
  • Loading branch information
Alexandre Curreli committed Dec 16, 2014
1 parent 36e9a05 commit 74388ef
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ organization := "com.livestream"

name := "scredis"

version := "2.0.5"
version := "2.0.6"

scalaVersion := "2.11.2"

Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/scredis/io/AbstractAkkaConnection.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import java.util.concurrent.{ CountDownLatch, TimeUnit }

abstract class AbstractAkkaConnection(
protected val system: ActorSystem,
protected val host: String,
protected val port: Int,
val host: String,
val port: Int,
@volatile protected var passwordOpt: Option[String],
@volatile protected var database: Int,
@volatile protected var nameOpt: Option[String],
Expand Down
4 changes: 1 addition & 3 deletions src/main/scala/scredis/io/SubscriberListenerActor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,9 @@ class SubscriberListenerActor(

override protected def always: Receive = super.always orElse {
case Subscribe(subscription) => {
subscriptionOpt = Some(subscription)
if (isInitialized) {
subscriptionOpt = Some(subscription)
decoders.route(Broadcast(DecoderActor.Subscribe(subscription)), self)
} else {
previousSubscriptionOpt = Some(subscription)
}
}
case Complete(message) => {
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scredis/serialization/Reader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import java.nio.charset.StandardCharsets
* @define e [[scredis.exceptions.RedisReaderException]]
*
*/
abstract class Reader[A] {
trait Reader[A] {

/**
* Internal read method to be implemented.
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scredis/serialization/Writer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import java.nio.charset.StandardCharsets
* @define e [[scredis.exceptions.RedisWriterException]]
*
*/
abstract class Writer[-A] {
trait Writer[A] {

/**
* Internal write method to be implemented.
Expand Down

0 comments on commit 74388ef

Please sign in to comment.