equal
deleted
inserted
replaced
28 #include "acc_debug.h" |
28 #include "acc_debug.h" |
29 #include "AccSrvASYProxyHandler.h" |
29 #include "AccSrvASYProxyHandler.h" |
30 #include "AccPolGenericIDAccessor.h" |
30 #include "AccPolGenericIDAccessor.h" |
31 #include "AccSrvSettingsHandler.h" |
31 #include "AccSrvSettingsHandler.h" |
32 #include "AccPolSubblockNameArrayAccessor.h" |
32 #include "AccPolSubblockNameArrayAccessor.h" |
33 #include "AccSrvChargingContextController.h" |
|
34 #include <AccConfigFileParser.h> |
33 #include <AccConfigFileParser.h> |
35 #include <s32mem.h> |
34 #include <s32mem.h> |
36 #include "AccSrvWiredConnectionPublisher.h" |
35 #include "AccSrvWiredConnectionPublisher.h" |
37 |
36 |
38 // EXTERNAL DATA STRUCTURES |
37 // EXTERNAL DATA STRUCTURES |
99 iConnectionStatusHandler = CAccSrvConnectionStatusHandler::NewL( this ); |
98 iConnectionStatusHandler = CAccSrvConnectionStatusHandler::NewL( this ); |
100 iModeHandler = CAccSrvModeHandler::NewL( this ); |
99 iModeHandler = CAccSrvModeHandler::NewL( this ); |
101 iASYProxyHandler = CAccSrvASYProxyHandler::NewL( this ); |
100 iASYProxyHandler = CAccSrvASYProxyHandler::NewL( this ); |
102 iSettingsHandler = CAccSrvSettingsHandler::NewL( this, *aServerModel ); |
101 iSettingsHandler = CAccSrvSettingsHandler::NewL( this, *aServerModel ); |
103 iWiredConnPublisher = CAccSrvWiredConnectionPublisher::NewL(); |
102 iWiredConnPublisher = CAccSrvWiredConnectionPublisher::NewL(); |
104 TRAPD( err, iChargingContextController = CAccSrvChargingContextController::NewL() ); |
|
105 if ( err != KErrNone ) // Server does not need to die on charging context fail. |
|
106 { |
|
107 COM_TRACE_1( "[AccFW:AccServer] CAccSrvConnectionController::ConstructL - CAccSrvChargingContextController err %d", err ); |
|
108 iChargingContextController = NULL; |
|
109 } |
|
110 |
103 |
111 COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::ConstructL - return void" ); |
104 COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::ConstructL - return void" ); |
112 } |
105 } |
113 |
106 |
114 // ----------------------------------------------------------------------------- |
107 // ----------------------------------------------------------------------------- |
165 if( NULL != iSettingsHandler ) |
158 if( NULL != iSettingsHandler ) |
166 { |
159 { |
167 delete iSettingsHandler; |
160 delete iSettingsHandler; |
168 } |
161 } |
169 |
162 |
170 if( NULL != iChargingContextController ) |
|
171 { |
|
172 delete iChargingContextController; |
|
173 } |
|
174 |
|
175 delete iWiredConnPublisher; |
163 delete iWiredConnPublisher; |
176 |
164 |
177 // Handlers must be deleted after iPolicy and iASYProxyHandler |
165 // Handlers must be deleted after iPolicy and iASYProxyHandler |
178 // (used from handlers). |
166 // (used from handlers). |
179 iConnectionHandler.ResetAndDestroy(); |
167 iConnectionHandler.ResetAndDestroy(); |