Skip to content

Commit 743e746

Browse files
committed
Integrate Grizzly 2.2.10.
1 parent d9cc9e1 commit 743e746

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@
529529
<dependency>
530530
<groupId>org.glassfish.grizzly</groupId>
531531
<artifactId>grizzly-websockets</artifactId>
532-
<version>2.2.5</version>
532+
<version>2.2.10</version>
533533
<optional>true</optional>
534534
</dependency>
535535
</dependencies>

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyResponse.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.ning.http.util.AsyncHttpProviderUtils;
2222

2323
import org.glassfish.grizzly.Buffer;
24+
import org.glassfish.grizzly.http.Cookies;
2425
import org.glassfish.grizzly.http.CookiesBuilder;
2526
import org.glassfish.grizzly.utils.Charsets;
2627
import org.glassfish.grizzly.memory.Buffers;
@@ -199,19 +200,20 @@ public boolean hasResponseBody() {
199200
// --------------------------------------------------------- Private Methods
200201

201202

202-
private List<Cookie> convertCookies(final List<org.glassfish.grizzly.http.Cookie> grizzlyCookies) {
203+
private List<Cookie> convertCookies(Cookies cookies) {
203204

204-
List<Cookie> cookies = new ArrayList<Cookie>(grizzlyCookies.size());
205+
final org.glassfish.grizzly.http.Cookie[] grizzlyCookies = cookies.get();
206+
List<Cookie> convertedCookies = new ArrayList<Cookie>(grizzlyCookies.length);
205207
for (org.glassfish.grizzly.http.Cookie gCookie : grizzlyCookies) {
206-
cookies.add(new Cookie(gCookie.getDomain(),
208+
convertedCookies.add(new Cookie(gCookie.getDomain(),
207209
gCookie.getName(),
208210
gCookie.getValue(),
209211
gCookie.getPath(),
210212
gCookie.getMaxAge(),
211213
gCookie.isSecure(),
212214
gCookie.getVersion()));
213215
}
214-
return Collections.unmodifiableList(cookies);
216+
return Collections.unmodifiableList(convertedCookies);
215217

216218
}
217219

0 commit comments

Comments
 (0)