fixed merge

diff --cc plugins/obd2plugin/obd2source.cpp
Simple merge

diff --cc plugins/websocketsourceplugin/websocketsource.cpp
index 14ea9f5,c335f2f..cb51b9c
--- 1/plugins/websocketsourceplugin/websocketsource.cpp
--- 2/plugins/websocketsourceplugin/websocketsource.cpp
+++ b/plugins/websocketsourceplugin/websocketsource.cpp
@@@ -437,54 -403,38 +412,45 @@@ static int callback_http_only(libwebsoc
                                }
                                else if (name == "get")
                                {
-                                       json_reader_read_member(reader,"data");
-                                       if (json_reader_is_object(reader))
+                                       
+                                       DebugOut() << __SMALLFILE__ << ":" << __LINE__ << "Got \"GET\" event:" << pairdata.size()<<endl;
+                                       if (source->uuidReplyMap.find(id) != source->uuidReplyMap.end())
                                        {
-                                               DebugOut() << __SMALLFILE__ << ":" << __LINE__ << "Got \"GET\" event:" << pairdata.size()<<endl;
+                                               json_object *propertyobject = json_object_object_get(dataobject,"property");
+                                               json_object *valueobject = json_object_object_get(dataobject,"value");
+                                               json_object *timestampobject = json_object_object_get(dataobject,"timestamp");
+                                               json_object *sequenceobject = json_object_object_get(dataobject,"sequence");
+                                               std::string property = json_object_get_string(propertyobject);
+                                               std::string value = json_object_get_string(valueobject);
+                                               std::string timestamp = json_object_get_string(timestampobject);
+                                               std::string sequence = json_object_get_string(sequenceobject);
+                                               json_object_put(propertyobject);
+                                               json_object_put(valueobject);
+                                               json_object_put(timestampobject);
+                                               json_object_put(sequenceobject);
+                                             
+                                               AbstractPropertyType* v = VehicleProperty::getPropertyTypeForPropertyNameValue(property,value);
+                                               v->timestamp = boost::lexical_cast<double,std::string>(timestamp);
+                                               v->sequence = boost::lexical_cast<double,std::string>(sequence);
                                                if (source->uuidReplyMap.find(id) != source->uuidReplyMap.end())
                                                {
-                                                       json_reader_read_member(reader,"property");
-                                                       std::string property = json_reader_get_string_value(reader);
-                                                       json_reader_end_member(reader);
-                                                             
-                                                       json_reader_read_member(reader,"value");
-                                                       std::string value = json_reader_get_string_value(reader);
-                                                       json_reader_end_member(reader);
-                                                       
-                                                       json_reader_read_member(reader,"timestamp");
-                                                       std::string timestamp = json_reader_get_string_value(reader);
-                                                       json_reader_end_member(reader);
-                                                       
-                                                       
-                                                       json_reader_read_member(reader,"sequence");
-                                                       std::string sequence = json_reader_get_string_value(reader);
-                                                       json_reader_end_member(reader);
-                                                     
-                                                       AbstractPropertyType* v = VehicleProperty::getPropertyTypeForPropertyNameValue(property,value);
-                                                       v->timestamp = boost::lexical_cast<double,std::string>(timestamp);
-                                                       v->sequence = boost::lexical_cast<double,std::string>(sequence);
-                                                       if (source->uuidReplyMap.find(id) != source->uuidReplyMap.end())
-                                                       {
-                                                               source->uuidReplyMap[id]->value = v;
-                                                               source->uuidReplyMap[id]->success = true;
-                                                               source->uuidReplyMap[id]->completed(source->uuidReplyMap[id]);
-                                                               source->uuidReplyMap.erase(id);
+                                                       source->uuidReplyMap[id]->value = v;
+                                                       source->uuidReplyMap[id]->success = true;
+                                                       source->uuidReplyMap[id]->completed(source->uuidReplyMap[id]);
+                                                       source->uuidReplyMap.erase(id);
 +<<<<<<< HEAD
 +                                                              delete v;
 +=======
 +>>>>>>> 46f67f8d33d8eccc26d9326ce1c6b9745dc6bb97
-                                                       }
-                                                       else
-                                                       {
-                                                               DebugOut() << "get methodReply has been recieved, without a request being in!. This is likely due to a request coming in after the timeout has elapsed.\n";
-                                                       }
+                                               }
+                                               else
+                                               {
+                                                       DebugOut() << "get methodReply has been recieved, without a request being in!. This is likely due to a request coming in after the timeout has elapsed.\n";
+                                               }
 +<<<<<<< HEAD
 +=======
- 
                                                        delete v;
-                                               }
 +>>>>>>> 46f67f8d33d8eccc26d9326ce1c6b9745dc6bb97
                                        }
                                        else
                                        {