Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 68392 invoked from network); 31 Jan 2011 14:05:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 31 Jan 2011 14:05:04 -0000 Received: (qmail 62890 invoked by uid 500); 31 Jan 2011 14:05:04 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 62768 invoked by uid 500); 31 Jan 2011 14:05:02 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 62760 invoked by uid 99); 31 Jan 2011 14:05:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jan 2011 14:05:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jan 2011 14:05:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BF5DC2388A39; Mon, 31 Jan 2011 14:04:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1065620 - in /cxf/branches/2.3.x-fixes: ./ tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java Date: Mon, 31 Jan 2011 14:04:40 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110131140440.BF5DC2388A39@eris.apache.org> 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 + // typeprefix not supported + // keyword since CORBA 3.0 + throw new RuntimeException("[TypeDclVisitor: typeprefix not supported!]"); } // TODO forward declaration