Author: ffang
Date: Mon Jan 31 14:04:40 2011
New Revision: 1065620
URL: http://svn.apache.org/viewvc?rev=1065620&view=rev
Log:
Merged revisions 1065609 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1065609 | ffang | 2011-01-31 21:38:03 +0800 (δΈ€, 31 1 2011) | 1 line
[CXF-3297]idl2wsdl fails with NPE if IDL contains typeprefix keyword
........
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/processors/idl/TypeDclVisitor.java
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/processors/idl/TypeDclVisitor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java?rev=1065620&r1=1065619&r2=1065620&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java
(original)
+++
cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java
Mon Jan 31 14:04:40 2011
@@ -70,6 +70,11 @@ public class TypeDclVisitor extends Visi
//
// native type not supported
throw new RuntimeException("[TypeDclVisitor: native type not
supported!]");
+ } else if (node.getType() == IDLTokenTypes.LITERAL_typeprefix) {
+ // typeprefix <scoped_name> <string_literal>
+ // typeprefix not supported
+ // keyword since CORBA 3.0
+ throw new RuntimeException("[TypeDclVisitor: typeprefix not
supported!]");
}
// TODO forward declaration <constr_forward_declaration>
