[jbossws-commits] JBossWS SVN: r5964 - stack/native/trunk/src/main/java/org/jboss/ws/tools/schema.
Author: mageshbk(a)jboss.com
Date: 2008-03-13 10:48:37 -0400 (Thu, 13 Mar 2008)
New Revision: 5964
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
Log:
[JBWS-2018] Fixed regression due to array types package lookup
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
---
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2008-03-13
13:43:44 UTC (rev 5963)
+++
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2008-03-13
14:48:37 UTC (rev 5964)
@@ -703,41 +703,40 @@
private String getNamespace(Class javaType, String defaultNS)
{
- if (javaType.isPrimitive())
- return Constants.NS_JBOSSWS_URI + "/primitives";
-
- while (javaType.isArray())
+ String retNS = defaultNS;
+ if (javaType.isPrimitive() && retNS == null)
{
- javaType = javaType.getComponentType();
+ retNS = Constants.NS_JBOSSWS_URI + "/primitives";
}
-
- Package javaPackage = javaType.getPackage();
- if (javaPackage == null)
+ else
{
- if (defaultNS != null)
+ while (javaType.isArray())
{
- return defaultNS;
+ javaType = javaType.getComponentType();
}
- else
+
+ Package javaPackage = javaType.getPackage();
+ if (javaPackage != null)
{
+ String packageName = javaPackage.getName();
+ String ns = packageNamespaceMap.get(packageName);
+ if (ns != null)
+ {
+ retNS = ns;
+ }
+ else if (retNS == null)
+ {
+ retNS = utils.getTypeNamespace(packageName);
+ }
+
+ allocatePrefix(retNS);
+ }
+ else if (retNS == null)
+ {
throw new WSException("Cannot determine namespace, Class had no
package");
}
}
- String packageName = javaPackage.getName();
-
- String ns = packageNamespaceMap.get(packageName);
- if (ns == null && defaultNS == null)
- {
- ns = utils.getTypeNamespace(packageName);
- }
- else if (ns == null)
- {
- ns = defaultNS;
- }
-
- allocatePrefix(ns);
-
- return ns;
+ return retNS;
}
private JBossXSComplexTypeDefinition getComplexTypeForJavaException(QName xmlType,
Class javaType)