Merge branch '2.2' into develop

server/core/dcb.cc

@@ -3458,7 +3458,7 @@ int poll_add_dcb(DCB *dcb)
         worker_id = MXS_WORKER_ALL;
     }
     else if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER &&
-             (strcasecmp(dcb->service->routerModule, "cli") == 0))
+             strcasecmp(dcb->service->routerModule, "cli") == 0)
     {
         // If the DCB refers to an accepted maxadmin socket, we force it
         // to the main thread. That's done in order to prevent a deadlock

server/core/test/test_poll.cc

@@ -52,6 +52,9 @@ test1()
     int eno = 0;
     SERV_LISTENER dummy;
 
+    SERVICE service;
+    service.routerModule = (char*)"required by a check in dcb.cc";
+
     /* Poll tests */
     ss_dfprintf(stderr,
                 "testpoll : Initialise the polling system.");
@@ -66,6 +69,7 @@ test1()
     }
 
     dcb->fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    dcb->service = &service;
 
     if (dcb->fd < 0)
     {