From a5a503c9825307e7d8afee9ff2cddeb5f1b49ced Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Wed, 23 Dec 2015 13:35:45 +0800
Subject: [PATCH] Bump version

---
 src/main/AndroidManifest.xml                            | 4 ++--
 src/main/scala/com/github/shadowsocks/BaseService.scala | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 54b317e23f..4f6479b9c8 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.github.shadowsocks"
-          android:versionCode="125"
-          android:versionName="2.9.3">
+          android:versionCode="126"
+          android:versionName="2.9.4">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/src/main/scala/com/github/shadowsocks/BaseService.scala b/src/main/scala/com/github/shadowsocks/BaseService.scala
index 2ca1757141..f580ed8a11 100644
--- a/src/main/scala/com/github/shadowsocks/BaseService.scala
+++ b/src/main/scala/com/github/shadowsocks/BaseService.scala
@@ -51,10 +51,10 @@ trait BaseService extends Service {
 
   @volatile private var state = State.STOPPED
   @volatile private var callbackCount = 0
+  @volatile protected var config: Config = null
 
   var timer: Timer = null
   var trafficMonitorThread: TrafficMonitorThread = null
-  var config: Config = null
 
   final val callbacks = new RemoteCallbackList[IShadowsocksServiceCallback]