Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E25DA9EC9 for ; Fri, 6 Apr 2012 17:57:07 +0000 (UTC) Received: (qmail 79017 invoked by uid 500); 6 Apr 2012 17:57:07 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 78924 invoked by uid 500); 6 Apr 2012 17:57:07 -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 78839 invoked by uid 99); 6 Apr 2012 17:57:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Apr 2012 17:57:07 +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; Fri, 06 Apr 2012 17:57:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2C19623889E0; Fri, 6 Apr 2012 17:56:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1310511 - in /cxf/branches/2.3.x-fixes: ./ api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java Date: Fri, 06 Apr 2012 17:56:46 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120406175646.2C19623889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Apr 6 17:56:45 2012 New Revision: 1310511 URL: http://svn.apache.org/viewvc?rev=1310511&view=rev Log: Merged revisions 1310461 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes ........ r1310461 | dkulp | 2012-04-06 12:36:57 -0400 (Fri, 06 Apr 2012) | 17 lines Merged revisions 1307674 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1307674 | dkulp | 2012-03-30 21:02:54 -0400 (Fri, 30 Mar 2012) | 9 lines Merged revisions 1307653 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1307653 | dkulp | 2012-03-30 19:49:56 -0400 (Fri, 30 Mar 2012) | 2 lines Fix a typo ........ ........ ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java?rev=1310511&r1=1310510&r2=1310511&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java (original) +++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java Fri Apr 6 17:56:45 2012 @@ -90,7 +90,7 @@ public final class SchemaInfo extends Ab return element; } if (getSchema() == null) { - throw new RuntimeException("No XmlSchma in SchemaInfo"); + throw new RuntimeException("No XmlSchema in SchemaInfo"); } XmlSchema sch = getSchema();