--- a/genericopenlibs/openenvcore/libc/src/timefuncs.cpp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/src/timefuncs.cpp Mon Oct 04 02:56:42 2010 +0300
@@ -221,7 +221,12 @@
TDateTime tdt = time.DateTime();
//enable the cache
- CTzConverter* ctzConverter = CTzConverter::NewL(Backend()->TZServer());
+ TInt status = KErrNone;
+ RTz& rtzServer = Backend()->TZServer(status);
+ if(status != KErrNone)
+ User::Leave(status);
+
+ CTzConverter* ctzConverter = CTzConverter::NewL(rtzServer);
CleanupStack::PushL(ctzConverter);
if(ctzConverter->ConvertToLocalTime(time) == KErrNone)
@@ -243,7 +248,7 @@
CleanupStack::PushL(zoneid);
atmStruct->tm_isdst = -1;
- UpdateDstAndTznameL(Backend()->TZServer(), *zoneid, atmStruct, time, Utime, tdt, ETzWallTimeReference);
+ UpdateDstAndTznameL(rtzServer, *zoneid, atmStruct, time, Utime, tdt, ETzWallTimeReference);
CleanupStack::PopAndDestroy(zoneid);
}
@@ -280,8 +285,12 @@
return;
}
+ TInt status = KErrNone;
+ RTz& rtzServer = Backend()->TZServer(status);
+ if(status != KErrNone)
+ User::Leave(status);
- CTzConverter* ctzConverter = CTzConverter::NewL(Backend()->TZServer());
+ CTzConverter* ctzConverter = CTzConverter::NewL(rtzServer);
CleanupStack::PushL(ctzConverter);
/* Following fields are updated if successful:
* tm_wday
@@ -305,7 +314,7 @@
CleanupStack::PushL(zoneid);
aTmStruct->tm_isdst = -1;
- UpdateDstAndTznameL(Backend()->TZServer(), *zoneid, aTmStruct, oldTime, time, tdt, ETzUtcTimeReference);
+ UpdateDstAndTznameL(rtzServer, *zoneid, aTmStruct, oldTime, time, tdt, ETzUtcTimeReference);
CleanupStack::PopAndDestroy(zoneid);
}
cachetm = *aTmStruct;