Projects >> async-http-client >>fc51bfe04f482024c085e5a25cb748bfb2f8bf2c

Chunk
Conflicting content 
                        boolean stripQueryString = config.isRemoveQueryParamOnRedirect();

                        if (!uri.toString().equalsIgnoreCase(future.getURI().toString())) {
<<<<<<< HEAD
                            final RequestBuilder builder = new RequestBuilder(future.getRequest()).setQueryParameters(null);
=======
                            final RequestBuilder builder = stripQueryString ?
                                      new RequestBuilder(future.getRequest()).setQueryParameters(null)
                                    : new RequestBuilder(future.getRequest());

>>>>>>> be7ae9a47df3a731377fc39e61c3f0831ac6e83f
                            final URI initialConnectionUri = future.getURI();
                            final boolean initialConnectionKeepAlive = future.getKeepAlive();
                            future.setURI(uri);
Solution content 
                        boolean stripQueryString = config.isRemoveQueryParamOnRedirect();

                        if (!uri.toString().equalsIgnoreCase(future.getURI().toString())) {
                            final RequestBuilder builder = stripQueryString ?
                                      new RequestBuilder(future.getRequest()).setQueryParameters(null)
                                    : new RequestBuilder(future.getRequest());

                            final URI initialConnectionUri = future.getURI();
                            final boolean initialConnectionKeepAlive = future.getKeepAlive();
                            future.setURI(uri);
File
NettyAsyncHttpProvider.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable