Projects >> nuxeo-features >>6eb059ed72ae8b933a021372f80ac688af1e29b7

Chunk
Conflicting content 
    public SimpleProxySelector() {
        String excludedHostsProperty = Framework.getProperty(SHINDIG_PROXY_EXCLUDE);
<<<<<<< HEAD
        String[] hosts;
        if (excludedHostsProperty == null) {
            hosts = new String[0];
        } else {
            hosts = excludedHostsProperty.split(",");
        }
        if (hosts.length > 0) {
            excludedHosts.addAll(Arrays.asList(hosts));
=======
        if (excludedHostsProperty != null) {
            String[] hosts = excludedHostsProperty.split(",");
            if (hosts.length > 0) {
                excludedHosts.addAll(Arrays.asList(hosts));
            }
>>>>>>> aa9938f6b100a6a6a39f11a78b1a0757a8d7d72c
        }
        excludedHosts.add("localhost");
        excludedHosts.add("127.0.0.1");
Solution content 
    @SuppressWarnings("unchecked")
    public SimpleProxySelector() {
        String excludedHostsProperty = Framework.getProperty(SHINDIG_PROXY_EXCLUDE);
        if (excludedHostsProperty != null) {
            String[] hosts = excludedHostsProperty.split(",");
            if (hosts.length > 0) {
                excludedHosts.addAll(Arrays.asList(hosts));
            }
        }
        excludedHosts.add("localhost");
        excludedHosts.add("127.0.0.1");
File
SimpleProxySelector.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
                proxy = false;
            }
        }
        boolean proxy = true;

        for (String host : excludedHosts) {
<<<<<<< HEAD
            if (uri.getHost().endsWith(host)) {
=======
            if (uri.getHost()
                    .endsWith(host)) {
>>>>>>> aa9938f6b100a6a6a39f11a78b1a0757a8d7d72c
Solution content 
        boolean proxy = true;

        for (String host : excludedHosts) {
            if (uri.getHost()
                    .endsWith(host)) {
                proxy = false;
            }
        }
File
SimpleProxySelector.java
Developer's decision
Version 1
Kind of conflict
If statement