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 di...@apache.org on 2008/08/19 10:23:40 UTC
svn commit: r686981 -
/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
Author: dimuthu
Date: Tue Aug 19 01:23:39 2008
New Revision: 686981
URL: http://svn.apache.org/viewvc?rev=686981&view=rev
Log:
resolved the bug when both elements and type has the same value- same namespace
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java?rev=686981&r1=686980&r2=686981&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java Tue Aug 19 01:23:39 2008
@@ -996,14 +996,20 @@
cName = xmlName;
}
+ cName = cName.replace('.','_');
+ cName = cName.replace('-','_');
+
while (listOfNames.contains(cName.toLowerCase())) {
+ if (!listOfNames.contains((cName + "E").toLowerCase())){
+ cName = cName + "E";
+ } else {
+ cName = cName + count++;
+ }
cName = cName + CStructWriter.count++;
}
- String intName = cName.replace('.','_');
- String outName = intName.replace('-','_');
- listOfNames.add(outName.toLowerCase());
- return outName;
+ listOfNames.add(cName.toLowerCase());
+ return cName;
}