cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r984895 - in /cxf/branches/2.2.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
Date Thu, 12 Aug 2010 18:17:49 GMT
Author: dkulp
Date: Thu Aug 12 18:17:49 2010
New Revision: 984895

URL: http://svn.apache.org/viewvc?rev=984895&view=rev
Log:
Merged revisions 984894 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r984894 | dkulp | 2010-08-12 14:16:42 -0400 (Thu, 12 Aug 2010) | 1 line
  
  [CXF-2824] Put NPE guard in place for looking up the method
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java?rev=984895&r1=984894&r2=984895&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
Thu Aug 12 18:17:49 2010
@@ -54,7 +54,7 @@ public abstract class AbstractInvoker im
             BindingOperationInfo bop = exchange.get(BindingOperationInfo.class);
             MethodDispatcher md = (MethodDispatcher) 
                 exchange.get(Service.class).get(MethodDispatcher.class.getName());
-            Method m = md.getMethod(bop);
+            Method m = bop == null ? null : md.getMethod(bop);
             if (m == null && bop == null) {
                 LOG.severe(new Message("MISSING_BINDING_OPERATION", LOG).toString());
                 throw new Fault(new Message("EXCEPTION_INVOKING_OBJECT", LOG, 



Mime
View raw message