Skip to content
This repository has been archived by the owner on Jan 27, 2021. It is now read-only.

Commit

Permalink
Fixed JERSEY-1777.
Browse files Browse the repository at this point in the history
- AsyncWebResource inherits properties from parent in path("") method.
- Added ignore for jersey-bundle sources.

Change-Id: I2ab33a6dc97fe0a36ce5a781ae2f0113990b9229
Signed-off-by: Marek Potociar <[email protected]>
  • Loading branch information
Marek Potociar committed Nov 5, 2013
1 parent cb9d386 commit 80aabb5
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# maven noise
target/
/jersey-bundle/src

# osx noise
.DS_Store
Expand Down
3 changes: 3 additions & 0 deletions changes.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
release 1.18
- Fixed issue JERSEY-1777
https://java.net/jira/browse/JERSEY-1777
AsyncWebResource.path(String) does not copy parent resource properties
- Fixed issue JERSEY-1652
https://java.net/jira/browse/JERSEY-1652
Moved taglib.tld from jersey-server to jersey-servlet module.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,6 @@

package com.sun.jersey.api.client;

import com.sun.jersey.api.client.async.AsyncClientHandler;
import com.sun.jersey.api.client.async.FutureListener;
import com.sun.jersey.api.client.async.ITypeListener;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.filter.Filterable;
import com.sun.jersey.client.impl.ClientRequestImpl;
import com.sun.jersey.client.impl.CopyOnWriteHashMap;
import com.sun.jersey.client.impl.async.FutureClientResponseListener;

import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriBuilder;
import java.net.URI;
import java.util.List;
import java.util.Locale;
Expand All @@ -64,6 +51,20 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriBuilder;

import com.sun.jersey.api.client.async.AsyncClientHandler;
import com.sun.jersey.api.client.async.FutureListener;
import com.sun.jersey.api.client.async.ITypeListener;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.filter.Filterable;
import com.sun.jersey.client.impl.ClientRequestImpl;
import com.sun.jersey.client.impl.CopyOnWriteHashMap;
import com.sun.jersey.client.impl.async.FutureClientResponseListener;

/**
* An encapsulation of an asynchronous Web resource capable of building requests
* to send to the Web resource and processing responses returned from the Web
Expand Down Expand Up @@ -104,6 +105,7 @@ protected AsyncWebResource(AsyncWebResource that, UriBuilder ub) {
super(that);
this.executorService = that.executorService;
this.u = ub.build();
this.properties = that.properties.clone();
}

/**
Expand Down Expand Up @@ -478,7 +480,7 @@ public AsyncWebResource queryParams(MultivaluedMap<String, String> params) {
// Builder that builds client request and handles it

/**
* The builder for building a {@link ClientRequest} instance and
* The builder for building a {@link ClientRequest} instance and
* handling the request using the {@link UniformInterface}. The methods
* of the {@link UniformInterface} are the build methods of the builder.
*/
Expand Down

0 comments on commit 80aabb5

Please sign in to comment.