commit a1cd8b94fbcf690a2f60661806e8b013e54689a7
author Robert Greenwalt <rgreenwalt@google.com> Wed May 30 15:33:20 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 30 15:33:20 2012 -0700
tree fba5d1543142c01822a63e0150f5c91f59d1d660
parent 393e559ddc06e8698841f8e141f5a5e24cffb942
parent 6f523cda13094bf493cdf37e7ecc480bb5a37a2b

am 6f523cda: am 7bb1b958: am ff856a2b: Merge "Add error handling to SocketClient::sendData"

* commit '6f523cda13094bf493cdf37e7ecc480bb5a37a2b':
  Add error handling to SocketClient::sendData

libsysutils/src/SocketClient.cpp

diff --git a/libsysutils/src/SocketClient.cpp b/libsysutils/src/SocketClient.cpp
index 4a1227f..3d4984d 100644
--- a/libsysutils/src/SocketClient.cpp
+++ b/libsysutils/src/SocketClient.cpp
@@ -131,11 +131,6 @@
 
 
 int SocketClient::sendMsg(const char *msg) {
-    if (mSocket < 0) {
-        errno = EHOSTUNREACH;
-        return -1;
-    }
-
     // Send the message including null character
     if (sendData(msg, strlen(msg) + 1) != 0) {
         SLOGW("Unable to send msg '%s'", msg);
@@ -158,6 +153,11 @@
     const char *p = (const char*) data;
     int brtw = len;
 
+    if (mSocket < 0) {
+        errno = EHOSTUNREACH;
+        return -1;
+    }
+
     if (len == 0) {
         return 0;
     }