commit df7f541e6f4b86c60d4f98711a9de278c78dfeb9
author Josh Gao <jmgao@google.com> Fri Sep 02 08:52:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 02 08:52:05 2016 +0000
tree 606f12d09d3e434efd9e90d8fb32bb7906d5d074
parent 95ad2a38dc55f4d67568be08c84bf243480127c0
parent a61359ee499a6e1e6c7bf4077815bda9e8709eb6

Merge "Fix adb." am: 50d606528d am: ff6d1a9656
am: e95214c467

Change-Id: Ibd72432b3572eab1559faed63ab60f69c22fbea4

adb/adb_client.cpp

diff --git a/adb/adb_client.cpp b/adb/adb_client.cpp
index 0b2fc1e..919e1c1 100644
--- a/adb/adb_client.cpp
+++ b/adb/adb_client.cpp
@@ -60,8 +60,8 @@
 }
 
 void adb_set_socket_spec(const char* socket_spec) {
-    if (!__adb_server_socket_spec) {
-        LOG(FATAL) << "attempted to reinitialize adb_server_socket_spec";
+    if (__adb_server_socket_spec) {
+        LOG(FATAL) << "attempted to reinitialize adb_server_socket_spec " << socket_spec << " (was " << __adb_server_socket_spec << ")";
     }
     __adb_server_socket_spec = socket_spec;
 }