Author: scamp
Date: Fri Apr 1 07:52:09 2005
New Revision: 159703
URL: http://svn.apache.org/viewcvs?view=rev&rev=159703
Log:
fixed nullpointers when generating web services with no resource properties
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java?view=diff&r1=159702&r2=159703
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
Fri Apr 1 07:52:09 2005
@@ -84,7 +84,15 @@
protected void validateProperties() throws InvalidWsrfWsdlException
{
boolean isValid = true;
- List propNameList = Arrays.asList( m_propNames );
+ List propNameList;
+ if (m_propNames != null)//avoid a null pointer if m_propNames are null
(i.e. no props defined)
+ {
+ propNameList = Arrays.asList( m_propNames );
+ }
+ else
+ {
+ propNameList = new ArrayList();//no properties were defined....
+ } //continue checking if implemented defs had props that the user
didn't implement
Iterator defIter = m_implementedResourceDefs.values().iterator();
while ( defIter.hasNext() )
{
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java?view=diff&r1=159702&r2=159703
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
Fri Apr 1 07:52:09 2005
@@ -359,22 +359,26 @@
props.setPrefix( GenerationUtils.getPrefix( targetNamespace ) );
props.setCustomMappings( GenerationUtils.getOperationInfoMap(
resourceDef ) );
props.setHasProperties( resourceDef.hasProperties() );
- QName[] propertyNames = resourceDef.getPropertyNames();
- Map propMap = new HashMap();
- for ( int i = 0; i < propertyNames.length; i++ )
+
+ if (resourceDef.hasProperties())
{
- QName propertyName = propertyNames[i];
- String propName = propertyName.getLocalPart().toUpperCase();
- int count = 2;
- while ( propMap.containsKey( propName ) )
+ QName[] propertyNames = resourceDef.getPropertyNames();
+ Map propMap = new HashMap();
+ for ( int i = 0; i < propertyNames.length; i++ )
{
- propName = propName + count;
- count++;
- }
+ QName propertyName = propertyNames[i];
+ String propName = propertyName.getLocalPart().toUpperCase();
+ int count = 2;
+ while ( propMap.containsKey( propName ) )
+ {
+ propName = propName + count;
+ count++;
+ }
- propMap.put( propName, propertyName );
+ propMap.put( propName, propertyName );
+ }
+ props.setPropertyMap( propMap );
}
- props.setPropertyMap( propMap );
props.setResourceImplements(
ImplementsListBuilder.getResourceImplementsList( resourceDef, m_portTypeInfoMap
) );
QName propertiesDocumentName = resourceDef.getPropertiesDocumentName();
if( propertiesDocumentName != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
