You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by aj...@apache.org on 2005/11/01 07:46:03 UTC

svn commit: r329994 - /webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/writer/JavaBeanWriter.java

Author: ajith
Date: Mon Oct 31 22:45:52 2005
New Revision: 329994

URL: http://svn.apache.org/viewcvs?rev=329994&view=rev
Log:
Fixed a javaname conflict with the bean writer

Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/writer/JavaBeanWriter.java

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/writer/JavaBeanWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/writer/JavaBeanWriter.java?rev=329994&r1=329993&r2=329994&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/writer/JavaBeanWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/writer/JavaBeanWriter.java Mon Oct 31 22:45:52 2005
@@ -247,6 +247,9 @@
      */
     private String getNonConflictingName(List listOfNames,String nameBase){
         String nameToReturn = nameBase;
+        if (JavaUtils.isJavaKeyword(nameToReturn)){
+            nameToReturn = JavaUtils.makeNonJavaKeyword(nameToReturn);
+        }
         while (listOfNames.contains(nameToReturn)){
             nameToReturn = nameToReturn + count++;
         }