You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ga...@apache.org on 2008/12/15 20:30:06 UTC

svn commit: r726779 - /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/PropertyDescriptorPlus.java

Author: gawor
Date: Mon Dec 15 11:30:06 2008
New Revision: 726779

URL: http://svn.apache.org/viewvc?rev=726779&view=rev
Log:
check for null (AXIS2-4178)

Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/PropertyDescriptorPlus.java

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/PropertyDescriptorPlus.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/PropertyDescriptorPlus.java?rev=726779&r1=726778&r2=726779&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/PropertyDescriptorPlus.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/PropertyDescriptorPlus.java Mon Dec 15 11:30:06 2008
@@ -135,7 +135,7 @@
                 throw new RuntimeException(Messages.getMessage("pDescrErr2",targetBean.getClass().getName()));
             }
             Object ret = method.invoke(targetBean, null);
-            if (method.getReturnType() == JAXBElement.class) {
+            if (ret != null && method.getReturnType() == JAXBElement.class) {
                 ret = ((JAXBElement) ret).getValue();
             }
             return ret;