Projects >> jolokia >>fa32a4ce850b7b9a76ee2b900ac782c572296dfa

Chunk
Conflicting content 
            realAddress = pConfig.getAddress();
            port = pConfig.getPort();
        }
<<<<<<< HEAD


        // Create proper context along with handler
        final String contextPath = config.getContextPath();

        StdoutLogHandler log = new StdoutLogHandler();

        // TODO: CTX Init
        JolokiaServiceManager serviceManager = new JolokiaServiceManagerImpl();
        serviceManager.addService(config.getJolokiaConfig());
        serviceManager.addService(log);

        // Add a restrictor factory
        serviceManager.addServiceFactory(new RestrictorServiceFactory(null));

        JolokiaContext jolokiaContext = serviceManager.start();
        jolokiaHttpHandler = new JolokiaHttpHandler(jolokiaContext);
        HttpContext context = httpServer.createContext(contextPath, jolokiaHttpHandler);

        // Special customizations
        addAuthenticatorIfNeeded(config.getUser(),config.getPassword(),context);
        initializeExecutor();

        InetSocketAddress realSocketAddress = httpServer.getAddress();
        InetAddress realAddress = realSocketAddress.getAddress() != null ? realSocketAddress.getAddress() : address;
=======
>>>>>>> a02fe23de165be0fa7857dad15e05309a242a9a6
        url = String.format("%s://%s:%d%s",
                            pConfig.getProtocol(),realAddress.getCanonicalHostName(),port,contextPath);
    }
Solution content 
            realAddress = pConfig.getAddress();
            port = pConfig.getPort();
        }
        url = String.format("%s://%s:%d%s",
                            pConfig.getProtocol(),realAddress.getCanonicalHostName(),port,contextPath);
    }
File
JolokiaServer.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Method invocation
Variable
Chunk
Conflicting content 
     *
     * @return an authenticator if authentication is switched on, or null if no authentication should be used.
     */
<<<<<<< HEAD
    public String getUser() {
        return jolokiaConfig.getConfig(ConfigKey.USER);
    }

    /**
     * Password to be used when authentication is switched on. If user is set, then
     * password must be set, too.
     * @return password
     */
    public String getPassword() {
        return jolokiaConfig.getConfig(ConfigKey.PASSWORD);
    }
=======
    public Authenticator getAuthenticator() {
        return authenticator;
    }

>>>>>>> a02fe23de165be0fa7857dad15e05309a242a9a6

    /**
     * Backlog of the HTTP server, which is the number of requests to keep before throwing them away
Solution content 
     *
     * @return an authenticator if authentication is switched on, or null if no authentication should be used.
     */
    public Authenticator getAuthenticator() {
        return authenticator;
    }

    /**
     * Backlog of the HTTP server, which is the number of requests to keep before throwing them away
File
JolokiaServerConfig.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration