Author: ffang
Date: Sun Jan 30 08:14:01 2011
New Revision: 1065221
URL: http://svn.apache.org/viewvc?rev=1065221&view=rev
Log:
Merged revisions 1065203 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1065203 | ffang | 2011-01-30 15:21:04 +0800 (日, 30 1 2011) | 1 line
[CXF-3295]idl2wsdl tool fails for some comment format
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/ExternalInterfaceRef.idl
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java?rev=1065221&r1=1065220&r2=1065221&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
(original)
+++
cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
Sun Jan 30 08:14:01 2011
@@ -198,8 +198,8 @@ public final class IdlPreprocessorReader
int pos = line.indexOf("**/");
//The comments need to be end with */, so if the line has ****/,
//we need to insert space to make it *** */
- if ((pos != -1) && (pos != 0)) {
- line = line.substring(0, pos) + " " + line.substring(pos + 1);
+ if (pos != -1) {
+ line = line.substring(0, pos + 1) + " " + line.substring(pos + 1);
}
return line;
}
Modified:
cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/ExternalInterfaceRef.idl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/ExternalInterfaceRef.idl?rev=1065221&r1=1065220&r2=1065221&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/ExternalInterfaceRef.idl
(original)
+++
cxf/branches/2.3.x-fixes/tools/corba/src/test/resources/idl/ExternalInterfaceRef.idl
Sun Jan 30 08:14:01 2011
@@ -23,6 +23,10 @@
#include "PragmaPrefix.idl"
module ExternalInterfaceRef {
+
+/**
+some comment
+**/
interface TestForExternalInterfaceRef
{
