Diff: MQTTTransport.cpp

Revision:

29:ac6390032cec

Parent:

21:54e3ad1c5c2e

Child:

31:e5950e0677be

--- a/MQTTTransport.cpp	Thu Apr 03 01:55:19 2014 +0000
+++ b/MQTTTransport.cpp	Mon Apr 07 03:15:02 2014 +0000
@@ -378,16 +378,17 @@
      return sent;
  }
  
+ static char _mqtt_id[MQTT_ENDPOINT_IDLEN+1];
+ 
  // connect up MQTT
  bool MQTTTransport::connect() {
-     if (network_mutex != NULL) network_mutex->lock();
-     char mqtt_id[MQTT_ENDPOINT_IDLEN+1];
-     memset(mqtt_id,0,(MQTT_ENDPOINT_IDLEN+1));
+     memset(_mqtt_id,0,(MQTT_ENDPOINT_IDLEN+1));
+     //if (network_mutex != NULL) network_mutex->lock();
      if (this->m_connected == false) {
          this->logger()->log("MQTT Init: %s:%d...",MQTT_HOSTNAME,MQTT_HOSTPORT);
          this->m_mqtt = &_mqtt;
          if (this->m_mqtt != NULL) {
-             char *id = this->makeID(MQTT_ENDPOINT_ID,mqtt_id);
+             char *id = this->makeID(MQTT_ENDPOINT_ID,_mqtt_id);
              this->logger()->log("MQTT Connect: ID: %s...",id);
              if (this->m_mqtt->connect(id)) {
                  this->logger()->log("MQTT Subscribe: Topic: %s...",this->getTopic());
@@ -423,7 +424,7 @@
      else {
          this->logger()->log("MQTT already connected (OK)");
      }
-     if (network_mutex != NULL) network_mutex->unlock();
+     //if (network_mutex != NULL) network_mutex->unlock();
      return this->m_connected;
  }