--- a/datacommsserver/esockserver/ssock/ss_nodemessages_legacy.cpp Fri Jan 22 10:58:59 2010 +0200
+++ b/datacommsserver/esockserver/ssock/ss_nodemessages_legacy.cpp Tue Jan 26 13:09:14 2010 +0200
@@ -122,7 +122,7 @@
}
else
{
- User::Leave(KErrNotFound);
+ User::Leave(KErrNotReady);
}
}
@@ -308,7 +308,7 @@
{
CConnection* conn = static_cast<CConnection*>(&aContext.Node());
ConnActivities::CConnLegacyRMessage2Activity* act = static_cast<ConnActivities::CConnLegacyRMessage2Activity*>(aContext.Activity());
- if (aError == KErrNotFound)
+ if (aError == KErrNotReady)
{
TPckgBuf<TStateChange> progressBuf;
progressBuf().iStage = conn->iLastProgress.iStage;
@@ -372,7 +372,7 @@
{
CConnection* conn = static_cast<CConnection*>(&aContext.Node());
ConnActivities::CConnLegacyRMessage2Activity* act = static_cast<ConnActivities::CConnLegacyRMessage2Activity*>(aContext.Activity());
- if (aError == KErrNotFound)
+ if (aError == KErrNotReady)
{
TPckgBuf<TStateChange> progressBuf;
progressBuf().iStage = conn->iLastProgressError.iStage;
@@ -646,15 +646,6 @@
// do nothing, a DataMonitoringTransferedRequest cannot be cancelled as the response is immediate
}
-TInt TLegacyDataMonitoringTransferredRequest::CheckError(MeshMachine::TNodeContextBase& /*aContext*/, TInt aError)
- {
- if (aError == KErrNotFound)
- {
- return KErrNotReady;
- }
- return aError;
- }
-
/**
Return ETrue if the node has a Service Provider, else EFalse.
@@ -779,11 +770,6 @@
}
}
-TInt TLegacyDataMonitoringNotificationRequest::CheckError(MeshMachine::TNodeContextBase& /*aContext*/, TInt aError)
- {
- return aError;
- }
-
/**
*
* TLegacyEnumerateSubConnections
@@ -890,7 +876,7 @@
// it or we hit the bottom
TRAP(ret, ForwardRequestL(aContext));
- if(ret == KErrNotFound)
+ if(ret == KErrNotReady)
{
// We've reached the bottom of the stack and control call was never serviced
User::Leave(KErrNotSupported);