summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
36173c8)
When transaction is aborted, its ObjectName was not unregistered from platform mbean server.
Change-Id: Ia9b70ca68622fc187ed3db734d9344bd0d7b4ce9
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Map<String, Map.Entry<ModuleFactory, BundleContext>> allCurrentFactories = Collections.unmodifiableMap(
resolver.getAllFactories());
Map<String, Map.Entry<ModuleFactory, BundleContext>> allCurrentFactories = Collections.unmodifiableMap(
resolver.getAllFactories());
+
+ // closed by transaction controller
ConfigTransactionLookupRegistry txLookupRegistry = new ConfigTransactionLookupRegistry(new TransactionIdentifier(
transactionName), factory, allCurrentFactories);
ServiceReferenceWritableRegistry writableRegistry = ServiceReferenceRegistryImpl.createSRWritableRegistry(
ConfigTransactionLookupRegistry txLookupRegistry = new ConfigTransactionLookupRegistry(new TransactionIdentifier(
transactionName), factory, allCurrentFactories);
ServiceReferenceWritableRegistry writableRegistry = ServiceReferenceRegistryImpl.createSRWritableRegistry(
}
private void internalAbort() {
}
private void internalAbort() {
+ logger.trace("Aborting {}", this);
transactionStatus.setAborted();
close();
}
public void close() {
dependencyResolverManager.close();
transactionStatus.setAborted();
close();
}
public void close() {
dependencyResolverManager.close();
+ txLookupRegistry.close();
- public void testAbort() throws InstanceAlreadyExistsException, ValidationException {
+ public void testAbort() throws Exception {
ConfigTransactionJMXClient transaction = configRegistryClient
.createTransaction();
assertEquals(1, configRegistryClient.getOpenConfigs().size());
transaction.abortConfig();
ConfigTransactionJMXClient transaction = configRegistryClient
.createTransaction();
assertEquals(1, configRegistryClient.getOpenConfigs().size());
transaction.abortConfig();
+ assertEquals(0, configRegistryClient.getOpenConfigs().size());
- transaction.createModule(TestingFixedThreadPoolModuleFactory.NAME,
- fixed1);
- fail();
- } catch (IllegalStateException e) {
- assertEquals("Configuration was aborted", e.getMessage());
- }
- try {
- transaction.validateConfig();
+ platformMBeanServer.getMBeanInfo(transaction.getObjectName());
- } catch (IllegalStateException e) {
- assertEquals("Configuration was aborted", e.getMessage());
+ }catch(InstanceNotFoundException e){
- assertEquals(0, configRegistryClient.getOpenConfigs().size());