Author: sergeyb
Date: Fri Sep 21 09:28:12 2012
New Revision: 1388387
URL: http://svn.apache.org/viewvc?rev=1388387&view=rev
Log:
Merged revisions 1388384 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1388384 | sergeyb | 2012-09-21 10:16:26 +0100 (Fri, 21 Sep 2012) | 1 line
Fixing a regression in the WADL code generator - tests have to be enhanced
asap
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1388384
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java?rev=1388387&r1=1388386&r2=1388387&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
(original)
+++
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
Fri Sep 21 09:28:12 2012
@@ -1096,7 +1096,7 @@ public class SourceGenerator {
String clsName = getSchemaClassName(packageName, gInfo,
actualValue,
info.getTypeClassNames());
- if (clsName != null) {
+ if (clsName == null) {
clsName = schemaTypeMap.get("{" + namespace + "}" +
actualValue);
}
if (clsName != null) {
