--- a/remotestoragefw/mountmanager/src/rsfwmountmanimpl.cpp Wed Mar 31 23:00:11 2010 +0300
+++ b/remotestoragefw/mountmanager/src/rsfwmountmanimpl.cpp Wed Apr 14 16:50:39 2010 +0300
@@ -396,7 +396,7 @@
TInt CRsfwMountManImpl::GetRsfwControlConnection()
{
TInt err = KErrNone;
- if (!iRsfwControlConnected)
+// if (!iRsfwControlConnected)
{
err = iRsfwControl.Connect();
if (!err)
--- a/remotestoragefw/mountmanager/src/rsfwmountutils.cpp Wed Mar 31 23:00:11 2010 +0300
+++ b/remotestoragefw/mountmanager/src/rsfwmountutils.cpp Wed Apr 14 16:50:39 2010 +0300
@@ -268,6 +268,7 @@
// if fetching the list of implemenations fail,'
// (for example a temporary out of memory situation)
// just accept the string
+ implinfo.ResetAndDestroy();
return ETrue;
}
@@ -279,12 +280,14 @@
_LIT8(KDelimiter, "://");
if (aDriveAddress.Length() < protocol.Length()+3)
{
+ implinfo.ResetAndDestroy();
return EFalse;
}
TPtrC8 test = aDriveAddress.Mid(protocol.Length(), 3);
if (!(test.Compare(KDelimiter) == 0))
{
+ implinfo.ResetAndDestroy();
return EFalse;
}
--- a/remotestoragefw/remotefileengine/src/rsfwconnectionmanager.cpp Wed Mar 31 23:00:11 2010 +0300
+++ b/remotestoragefw/remotefileengine/src/rsfwconnectionmanager.cpp Wed Apr 14 16:50:39 2010 +0300
@@ -279,7 +279,15 @@
else
{
DEBUGSTRING(("StartConnection called twice!"));
- err = KErrGeneral;
+ Cancel();
+
+ DEBUGSTRING(("StartConnection Cancel!"));
+
+ iConnection.ProgressNotification(iProgress, iStatus);
+ DEBUGSTRING(("CRsfwConnectionManager iConnection.ProgressNotification!"));
+
+ SetActive();
+
}
return err;
}
--- a/remotestoragefw/webdavaccessplugin/src/rsfwdavaccesscontext.cpp Wed Mar 31 23:00:11 2010 +0300
+++ b/remotestoragefw/webdavaccessplugin/src/rsfwdavaccesscontext.cpp Wed Apr 14 16:50:39 2010 +0300
@@ -193,8 +193,8 @@
{
DEBUGSTRING(("DAV: OptionsL raw err=%d", aError));
if ((aError == KErrCommsLineFail) ||
- (aError == KErrNotReady) ||
- (aError == KErrDisconnected))
+ (aError == KErrNotReady) )
+// (aError == KErrDisconnected))
{
iTryCount--;
}