Author: richard.opalka(a)jboss.com Date: 2008-04-28 12:34:40 -0400 (Mon, 28 Apr 2008) New Revision: 6728 Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java Log: [JBWS-2159] fixing NPE Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2008-04-28 14:50:43 UTC (rev 6727) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2008-04-28 16:34:40 UTC (rev 6728) @@ -318,17 +318,22 @@ throw fault; // rethrow } - if (inv.getJavaMethod() != null) + try { - logger.debug("Invoking method: " + inv.getJavaMethod().getName()); - this.delegate.invoke(ep, inv); + if (inv.getJavaMethod() != null) + { + logger.debug("Invoking method: " + inv.getJavaMethod().getName()); + this.delegate.invoke(ep, inv); + } + else + { + logger.debug("RM lifecycle protocol method detected"); + } } - else + finally { - logger.debug("RM lifecycle protocol method detected"); + setupResponseContext(rmResponseContext); } - - setupResponseContext(rmResponseContext); } private void setupResponseContext(Map<String, Object> rmResponseContext)