Skip to content
This repository was archived by the owner on Mar 6, 2021. It is now read-only.

Commit e0f4813

Browse files
committed
Integrate Grizzly 2.2.10.
1 parent 9331839 commit e0f4813

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
@@ -528,7 +528,7 @@
528528
<dependency>
529529
<groupId>org.glassfish.grizzly</groupId>
530530
<artifactId>grizzly-websockets</artifactId>
531-
<version>2.2.5</version>
531+
<version>2.2.10</version>
532532
<optional>true</optional>
533533
</dependency>
534534
</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
@@ -22,6 +22,7 @@
2222
import com.ning.http.util.AsyncHttpProviderUtils;
2323

2424
import org.glassfish.grizzly.Buffer;
25+
import org.glassfish.grizzly.http.Cookies;
2526
import org.glassfish.grizzly.http.CookiesBuilder;
2627
import org.glassfish.grizzly.utils.Charsets;
2728
import org.glassfish.grizzly.memory.Buffers;
@@ -291,19 +292,20 @@ public boolean hasResponseBody() {
291292
// --------------------------------------------------------- Private Methods
292293

293294

294-
private List<Cookie> convertCookies(final List<org.glassfish.grizzly.http.Cookie> grizzlyCookies) {
295+
private List<Cookie> convertCookies(Cookies cookies) {
295296

296-
List<Cookie> cookies = new ArrayList<Cookie>(grizzlyCookies.size());
297+
final org.glassfish.grizzly.http.Cookie[] grizzlyCookies = cookies.get();
298+
List<Cookie> convertedCookies = new ArrayList<Cookie>(grizzlyCookies.length);
297299
for (org.glassfish.grizzly.http.Cookie gCookie : grizzlyCookies) {
298-
cookies.add(new Cookie(gCookie.getDomain(),
300+
convertedCookies.add(new Cookie(gCookie.getDomain(),
299301
gCookie.getName(),
300302
gCookie.getValue(),
301303
gCookie.getPath(),
302304
gCookie.getMaxAge(),
303305
gCookie.isSecure(),
304306
gCookie.getVersion()));
305307
}
306-
return Collections.unmodifiableList(cookies);
308+
return Collections.unmodifiableList(convertedCookies);
307309

308310
}
309311

0 commit comments

Comments
 (0)