--- src/adaptation/ecap/ServiceRep.cc.orig	2015-08-01 06:08:17 UTC

+++ src/adaptation/ecap/ServiceRep.cc

@@ -234,7 +234,7 @@ bool Adaptation::Ecap::ServiceRep::probe

 bool Adaptation::Ecap::ServiceRep::up() const

 {

-    return theService != NULL;

+    return theService;

 }

 bool Adaptation::Ecap::ServiceRep::wantsUrl(const String &urlPath) const

--- src/adaptation/ecap/XactionRep.cc.orig	2015-08-01 06:08:17 UTC

+++ src/adaptation/ecap/XactionRep.cc

@@ -72,7 +72,7 @@ void

 Adaptation::Ecap::XactionRep::master(const AdapterXaction &x)

 {

     Must(!theMaster);

-    Must(x != NULL);

+    Must(x);

     theMaster = x;

 }

@@ -259,7 +259,7 @@ Adaptation::Ecap::XactionRep::swanSong()

     // clear body_pipes, if any

     // this code does not maintain proxying* and canAccessVb states; should it?

-    if (theAnswerRep != NULL) {

+    if (theAnswerRep) {

         BodyPipe::Pointer body_pipe = answer().body_pipe;

         if (body_pipe != NULL) {

             Must(body_pipe->stillProducing(this));

@@ -318,7 +318,7 @@ Adaptation::Ecap::XactionRep::cause()

 libecap::Message &

 Adaptation::Ecap::XactionRep::adapted()

 {

-    Must(theAnswerRep != NULL);

+    Must(theAnswerRep);

     return *theAnswerRep;

 }