Projects >> IRIS >>3fce676b7e6571852c8bb6bb83e873599e2cbf00

Chunk
Conflicting content
		return new ConsumerQueryEntitiesRequest(getClient(), null, getServiceRootUri(), getMetadata(), entitySetName, null) {
			  @Override
			  public Enumerable execute() throws ODataProducerException {
<<<<<<< HEAD
			    String path = Enumerable.create(getSegments()).join("/");
			    final ODataClientRequest request = ODataClientRequest.get(getServiceRootUri() + path);
=======
			    final ODataClientRequest request = buildRequest(null);
>>>>>>> c8619f366fa743fff7074e875e56ee7f5c9be2bc
			    ODataClientResponse response = getClient().getEntities(request);
			    if (response == null)
			      return null;
Solution content
		return new ConsumerQueryEntitiesRequest(getClient(), null, getServiceRootUri(), getMetadata(), entitySetName, null) {
			  @Override
			  public Enumerable execute() throws ODataProducerException {
			    final ODataClientRequest request = buildRequest(null);
			    ODataClientResponse response = getClient().getEntities(request);
			    if (response == null)
			      return null;
File
ODataJerseyConsumerExt.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable