Author: dkulp Date: Wed Nov 28 20:39:21 2012 New Revision: 1414912 URL: http://svn.apache.org/viewvc?rev=1414912&view=rev Log: Merged revisions 1414905 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1414905 | dkulp | 2012-11-28 15:35:17 -0500 (Wed, 28 Nov 2012) | 10 lines Merged revisions 1414899 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1414899 | dkulp | 2012-11-28 15:29:38 -0500 (Wed, 28 Nov 2012) | 2 lines Register the error listener sooner to catch parse errors ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java?rev=1414912&r1=1414911&r2=1414912&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java Wed Nov 28 20:39:21 2012 @@ -1370,6 +1370,10 @@ public class SourceGenerator { private JCodeModel createCodeModel(List<SchemaInfo> schemaElements, Set<String> type) { SchemaCompiler compiler = createCompiler(type); + Object elForRun = ReflectionInvokationHandler + .createProxyWrapper(new InnerErrorListener(), + JAXBUtils.getParamClass(compiler, "setErrorListener")); + compiler.setErrorListener(elForRun); compiler.setEntityResolver(OASISCatalogManager.getCatalogManager(bus) .getEntityResolver()); if (compilerArgs.size() > 0) { @@ -1381,11 +1385,6 @@ public class SourceGenerator { compiler.getOptions().addBindFile(is); } - Object elForRun = ReflectionInvokationHandler - .createProxyWrapper(new InnerErrorListener(), - JAXBUtils.getParamClass(compiler, "setErrorListener")); - - compiler.setErrorListener(elForRun); S2JJAXBModel intermediateModel = compiler.bind(); JCodeModel codeModel = intermediateModel.generateCode(null, elForRun); JAXBUtils.logGeneratedClassNames(LOG, codeModel);
