Author: veithen
Date: Sat Jun 27 12:02:57 2015
New Revision: 1687914
URL: http://svn.apache.org/r1687914
Log:
AXIS-2442: Merge r512459 from the old trunk. Do not write constructors for
JavaBeans that have more than 254 arguments as Java will not compile these
classes.
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/ (props changed)
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
Propchange: axis/axis1/java/trunk/axis-codegen/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Jun 27 12:02:57 2015
@@ -0,0 +1,4 @@
+/axis/axis1/java/branches/AXIS-1984/axis-codegen/src/main/java:1398421-1398984
+/axis/axis1/java/branches/EMF/axis-codegen/src/main/java:1417039-1418230
+/webservices/axis/trunk/java/axis-codegen/src/main/java:392364
+/webservices/axis/trunk/java/src:512459
Modified:
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java?rev=1687914&r1=1687913&r2=1687914&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
(original)
+++
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
Sat Jun 27 12:02:57 2015
@@ -637,9 +637,14 @@ public class JavaBeanWriter extends Java
pw.println();
}
+ /**
+ * Write a constructor containing the fields in this class.
+ * Will not write a construtor with more than 254 arguments as
+ * the Java compiler will choke.
+ */
protected void writeMinimalConstructor() {
- if (isUnion() || names.size() == 0) {
+ if (isUnion() || names.size() == 0 || names.size() > 254) {
return;
}
@@ -770,7 +775,7 @@ public class JavaBeanWriter extends Java
int localParams = paramTypes.size() - names.size() / 2;
// Now write the constructor signature
- if (paramTypes.size() > 0) {
+ if (paramTypes.size() > 0 && paramTypes.size() < 255) {
// Prevent name clash between local parameters and the
// parameters for the super class
