Author: chris.laprun(a)jboss.com Date: 2011-04-27 12:38:51 -0400 (Wed, 27 Apr 2011) New Revision: 6372 Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/servlet/ServletAccess.java Log: - GTNWSRP-224: Fixed getResponse to avoid NPE. Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/servlet/ServletAccess.java =================================================================== --- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/servlet/ServletAccess.java 2011-04-27 16:15:01 UTC (rev 6371) +++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/servlet/ServletAccess.java 2011-04-27 16:38:51 UTC (rev 6372) @@ -91,7 +91,8 @@ public static HttpServletResponse getResponse() { - return local.get().resp; + Invocation invocation = local.get(); + return invocation != null ? invocation.resp : null; } private static class Invocation