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 ve...@apache.org on 2005/08/02 15:07:16 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaStubWriter.java
venkat 2005/08/02 06:07:16
Modified: java/src/org/apache/axis/wsdl/toJava JavaStubWriter.java
Log:
Patch for a regression issue introduced by revision 1.43, resulting NPE.
Basically adding two lines for null check, but the diff might show lot of lines with white space modifications due to adjusting indentation after adding the check.
Revision Changes Path
1.156 +26 -22 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
Index: JavaStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- JavaStubWriter.java 1 Aug 2005 18:23:29 -0000 1.155
+++ JavaStubWriter.java 2 Aug 2005 13:07:16 -0000 1.156
@@ -1284,32 +1284,36 @@
}
// End catch
// Get faults
+
Map faults = parms.faults;
// Get faults of signature
List exceptionsThrowsList = new ArrayList();
- int index = parms.signature.indexOf("throws");
- if (index != -1) {
- String[] thrExcep = StringUtils.split(parms.signature.substring(index+6),',');
- for (int i = 0; i < thrExcep.length; i++) {
- exceptionsThrowsList.add(thrExcep[i].trim());
- }
- }
- pw.println(" } catch (org.apache.axis.AxisFault axisFaultException) {");
- if (faults != null && faults.size() > 0) {
- pw.println(" if (axisFaultException.detail != null) {");
- for (Iterator faultIt = exceptionsThrowsList.iterator(); faultIt
- .hasNext();) {
- String exceptionFullName = (String) faultIt.next();
- pw.println(" if (axisFaultException.detail instanceof "
- + exceptionFullName + ") {");
- pw.println(" throw (" + exceptionFullName
- + ") axisFaultException.detail;");
- pw.println(" }");
- }
- pw.println(" }");
+
+ if (parms.signature != null) {
+ int index = parms.signature.indexOf("throws");
+ if (index != -1) {
+ String[] thrExcep = StringUtils.split(parms.signature.substring(index+6),',');
+ for (int i = 0; i < thrExcep.length; i++) {
+ exceptionsThrowsList.add(thrExcep[i].trim());
+ }
+ }
+ pw.println(" } catch (org.apache.axis.AxisFault axisFaultException) {");
+ if (faults != null && faults.size() > 0) {
+ pw.println(" if (axisFaultException.detail != null) {");
+ for (Iterator faultIt = exceptionsThrowsList.iterator(); faultIt
+ .hasNext();) {
+ String exceptionFullName = (String) faultIt.next();
+ pw.println(" if (axisFaultException.detail instanceof "
+ + exceptionFullName + ") {");
+ pw.println(" throw (" + exceptionFullName
+ + ") axisFaultException.detail;");
+ pw.println(" }");
+ }
+ pw.println(" }");
+ }
+ pw.println(" throw axisFaultException;");
+ pw.println("}");
}
- pw.println(" throw axisFaultException;");
- pw.println("}");
} // writeResponseHandling
/**