Projects >> voldemort >>0a04cf95879a2a357c9ba1795b327f7942b2ccc0

Chunk
Conflicting content 
        for(VoldemortService service: services)
            registerBean(service, JmxUtils.createObjectName(service.getClass()));
        for(Store store: this.storeRepository.getAllStorageEngines()) {
<<<<<<< HEAD
            if(server.getVoldemortConfig().isEnableJmxClusterName())
                registerBean(store,
                             JmxUtils.createObjectName(this.cluster.getName()
                                                               + "."
                                                               + JmxUtils.getPackageName(store.getClass()),
                                                       store.getName()));
            else
                registerBean(store,
                             JmxUtils.createObjectName(JmxUtils.getPackageName(store.getClass()),
                                                       store.getName()));
=======
            registerBean(store,
                         JmxUtils.createObjectName(JmxUtils.getPackageName(store.getClass()),
                                                   store.getName()));
            if(store instanceof BdbStorageEngine) {
                // Temp hack for now
                BdbStorageEngine bdbStore = (BdbStorageEngine) store;
                registerBean(bdbStore.getBdbEnvironmentStats(),
                             JmxUtils.createObjectName(JmxUtils.getPackageName(BdbEnvironmentStats.class),
                                                       store.getName()));
            }
>>>>>>> 74e0d94476799fc4b2f34317dfa4b00a051469e0
        }
    }
Solution content 
        for(VoldemortService service: services)
            registerBean(service, JmxUtils.createObjectName(service.getClass()));
        for(Store store: this.storeRepository.getAllStorageEngines()) {
            if(server.getVoldemortConfig().isEnableJmxClusterName())
                registerBean(store,
                             JmxUtils.createObjectName(this.cluster.getName()
                                                               + "."
                                                               + JmxUtils.getPackageName(store.getClass()),
                                                       store.getName()));
            else
                registerBean(store,
                             JmxUtils.createObjectName(JmxUtils.getPackageName(store.getClass()),
                                                       store.getName()));
            if(store instanceof BdbStorageEngine) {
                // Temp hack for now
                BdbStorageEngine bdbStore = (BdbStorageEngine) store;
                registerBean(bdbStore.getBdbEnvironmentStats(),
                             JmxUtils.createObjectName(JmxUtils.getPackageName(BdbEnvironmentStats.class),
                                                       store.getName()));
            }
        }
    }
File
JmxService.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation