Looks fine.
Thanks,
Romain
On 8/29/12 11:22 AM, Oleksiy Stashok wrote:
> Hi,
>
> Please review change to upgrade Grizzly library to 2.3-beta1 in trunk.
>
> WBR,
> Alexey.
>
> --- appserver/packager/resources/pkg_conf.py (revision 55674)
> +++ appserver/packager/resources/pkg_conf.py (working copy)
> @@ -65,7 +65,7 @@
> javadb_version="10.5.3.0,0-0"
> corba_version="3.2.0,0-6"
> jsf_version="2.2.0,0-5"
> -grizzly_version="2.2.16,0-0"
> +grizzly_version="2.3,0-0"
> metro_version="2.3,0-55"
> javahelp_version="2.0.2,0-1"
> shoal_version="1.6.18,0-0"
> Index: pom.xml
> ===================================================================
> --- pom.xml (revision 55674)
> +++ pom.xml (working copy)
> @@ -109,7 +109,7 @@
> <jsf-ext.version>0.2</jsf-ext.version>
> <woodstock.version>4.0.2.10</woodstock.version>
> <jaxrpc-api.version>1.1</jaxrpc-api.version>
> - <grizzly.version>2.2.16</grizzly.version>
> + <grizzly.version>2.3-beta1</grizzly.version>
> <jsr181-api.version>1.0-MR1</jsr181-api.version>
> <saaj-api.version>1.3.4</saaj-api.version>
> <hk2.version>2.1.26</hk2.version>
>
>
>
>
>
> Index:
> appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java
> ===================================================================
> ---
> appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java
> (revision 55674)
> +++
> appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java
> (working copy)
> @@ -2627,9 +2627,10 @@
> responsePacket.setStatus(HttpStatus.BAD_REQUEST_400);
>
> org.glassfish.grizzly.http.server.Request request
> = org.glassfish.grizzly.http.server.Request.create();
> - org.glassfish.grizzly.http.server.Response
> response = org.glassfish.grizzly.http.server.Response.create();
> +// org.glassfish.grizzly.http.server.Response
> response = org.glassfish.grizzly.http.server.Response.create();
> + org.glassfish.grizzly.http.server.Response
> response = request.getResponse();
>
> - request.initialize(response, requestPacket,
> FilterChainContext.create(connection), null);
> + request.initialize(/*response,*/ requestPacket,
> FilterChainContext.create(connection), null);
> response.initialize(request, responsePacket,
> FilterChainContext.create(connection), null, null);
>
> Response res = new Response();
> Index: appserver/packager/resources/pkg_conf.py
> ===================================================================