| Chunk |
|---|
| Conflicting content |
|---|
});
<<<<<<< HEAD
try {
m_fwk = new Felix(configProps);
m_fwk.init();
// (10) Start the framework.
m_fwk.start();
printWelcome();
=======
try {
m_fwk = new Felix(configProps){
@Override
public void stop() throws BundleException {
try {
EmbeddedActivators.getBootstrapActivator().stop(m_fwk.getBundleContext());
} catch(Exception e) {
}
super.stop();
}
};
m_fwk.init();
// (10) Start the framework.
m_fwk.start();
printWelcome();
>>>>>>> a7fa82923712de8b24f56fb8a63e9852b3eba25e
logger.debug("Felix Embedded started");
// (11) Wait for framework to stop to exit the VM. |
| Solution content |
|---|
public void run() {
try {
logger.debug("Stopping OSGi Embedded Framework");
if (m_fwk != null) {
EmbeddedActivators.getBootstrapActivator().stop(m_fwk.getBundleContext());
m_fwk.stop();
m_fwk.waitForStop(0);
}
} catch (Exception ex) {
logger.warn("Error stopping framework: ", ex);
}
}
});
try {
m_fwk = new Felix(configProps){
@Override
public void stop() throws BundleException {
try {
EmbeddedActivators.getBootstrapActivator().stop(m_fwk.getBundleContext());
} catch(Exception e) {
}
super.stop();
}
};
m_fwk.init();
// (10) Start the framework.
m_fwk.start();
printWelcome();
|
| File |
|---|
| EmbeddedFelix.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method invocation |
| Try statement |