removed G_IO_IN condition

diff --git a/ambd/core.cpp b/ambd/core.cpp
index 0b9669a..8d17a19 100644 (file)
--- a/ambd/core.cpp
+++ b/ambd/core.cpp
@@ -282,7 +282,7 @@ void Core::unsubscribeToProperty(VehicleProperty::Property property, AbstractSin
 {
        if(propertySinkMap.find(property) == propertySinkMap.end())
        {
-               DebugOut(1)<<__FUNCTION__<<"property not supported: "<<property;
+               DebugOut(1)<<__FUNCTION__<<"property not supported: "<<property<<endl;
                return; 
        }
                

diff --git a/plugins/websocketsink/websocketsinkmanager.cpp b/plugins/websocketsink/websocketsinkmanager.cpp
index af8e982..b0256e2 100644 (file)
--- a/plugins/websocketsink/websocketsinkmanager.cpp
+++ b/plugins/websocketsink/websocketsinkmanager.cpp
@@ -787,13 +787,6 @@ bool gioPollingFunc(GIOChannel *source, GIOCondition condition,gpointer data)
                DebugOut(0)<<"websocketsink polling error."<<endl;
        }
 
-       if (! condition & G_IO_IN)
-       {
-               //Don't need to do anything
-
-               return true;
-       }
-
        if (condition & G_IO_HUP)
        {
                //Hang up. Returning false closes out the GIOChannel.
@@ -812,5 +805,6 @@ bool gioPollingFunc(GIOChannel *source, GIOCondition condition,gpointer data)
        pollstruct.events = condition;
        pollstruct.revents = condition;
        libwebsocket_service_fd(context,&pollstruct);
+
        return true;
 }