equal
deleted
inserted
replaced
163 err |= iASelectLock.CreateLocal(); |
163 err |= iASelectLock.CreateLocal(); |
164 //Protect the iDefConnection from concurrent GetDefaultConnection calls |
164 //Protect the iDefConnection from concurrent GetDefaultConnection calls |
165 err |= iDefConnLock.CreateLocal(); |
165 err |= iDefConnLock.CreateLocal(); |
166 } |
166 } |
167 |
167 |
|
168 if(err == KErrNone) |
|
169 { |
|
170 err = iTzServer.Connect(); |
|
171 if(!err) |
|
172 { |
|
173 err = iTzServer.ShareAuto(); |
|
174 } |
|
175 } |
|
176 |
|
177 |
168 //Panic if any of the above operation returns with error |
178 //Panic if any of the above operation returns with error |
169 if (err) |
179 if (err) |
170 { |
180 { |
171 User::Panic(KEstlibInit, err); |
181 User::Panic(KEstlibInit, err); |
172 } |
182 } |
173 |
183 |
174 iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock); |
184 iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock, &iTzServer); |
175 |
185 |
176 // No connection settings by default |
186 // No connection settings by default |
177 iDefConnPref = NULL; |
187 iDefConnPref = NULL; |
178 } |
188 } |
179 |
189 |
1598 err=status.Int(); |
1608 err=status.Int(); |
1599 if (!err) |
1609 if (!err) |
1600 { |
1610 { |
1601 err=iFids.Attach(fd,newf); |
1611 err=iFids.Attach(fd,newf); |
1602 if (!err) |
1612 if (!err) |
1603 return fd; |
1613 return fd; |
1604 delete newf; |
1614 newf->Close(); |
1605 } |
1615 } |
1606 else if(newf != NULL) |
1616 else if(newf != NULL) |
1607 { |
1617 { |
1608 //coverity[leave_without_push] |
1618 //coverity[leave_without_push] |
1609 delete newf; |
1619 newf->Close(); |
1610 } |
1620 } |
1611 iFids.Attach(fd,0); // cancel the reservation |
1621 iFids.Attach(fd,0); // cancel the reservation |
1612 } |
1622 } |
1613 //coverity[memory_leak] |
1623 //coverity[memory_leak] |
1614 } |
1624 } |