| Chunk |
|---|
| Conflicting content |
|---|
this.locator = locator;
try {
cfg.load(locator);
<<<<<<< HEAD
// FIXME TODO workarounf to work with nxruntime core 1.3.3 --------------
=======
// FIXME TODO workaround to work with nxruntime core 1.3.3 --------------
>>>>>>> eb205565b9ac217e8a33d1a97916502c46996ef1
String newPort = Framework.getProperty("org.nuxeo.runtime.1.3.3.streaming.port");
if (newPort != null) {
StreamingService streamingService = (StreamingService) Framework.getRuntime().getComponent( |
| Solution content |
|---|
this.locator = locator;
try {
cfg.load(locator);
// FIXME TODO workaround to work with nxruntime core 1.3.3 --------------
String newPort = Framework.getProperty("org.nuxeo.runtime.1.3.3.streaming.port");
if (newPort != null) {
StreamingService streamingService = (StreamingService) Framework.getRuntime().getComponent( |
| File |
|---|
| NuxeoClient.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
streamingService.startManager();
}
}
<<<<<<< HEAD
// FIXME TODO workaround for remote services -------------------------------
schemaRemotingWorkaround(locator.getHost());
// workaround for client login configuration - we need to make it not multi threaded
=======
// ------------------------------------------------------------------------
// ------------------------------ FIXME TODO workaround for remote services
schemaRemotingWorkaround(locator.getHost());
// ------------------------------------------------------------------------------
// workaround for client login configuration - we need to make it not multithreaded
>>>>>>> eb205565b9ac217e8a33d1a97916502c46996ef1
// TODO put an option for this in NuxeoClient
if (!multiThreadedLogin) {
LoginService ls = Framework.getService(LoginService.class); |
| Solution content |
|---|
streamingService.startManager();
}
}
// FIXME TODO workaround for remote services -------------------------------
schemaRemotingWorkaround(locator.getHost());
// workaround for client login configuration - we need to make it not multi threaded
// TODO put an option for this in NuxeoClient
if (!multiThreadedLogin) {
LoginService ls = Framework.getService(LoginService.class); |
| File |
|---|
| NuxeoClient.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |