Author: kstam
Date: Wed Jun 29 17:00:20 2011
New Revision: 1141164
URL: http://svn.apache.org/viewvc?rev=1141164&view=rev
Log:
JUDDI-507 A SOAP validation error will occur if an empty list of tModels or
Businesses is returned. Instead, if the list is empty we should not return it.
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java?rev=1141164&r1=1141163&r2=1141164&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
Wed Jun 29 17:00:20 2011
@@ -459,28 +459,32 @@ public class UDDIPublicationImpl extends
// Sort and retrieve the final results
List<?> queryResults =
FetchBusinessEntitiesQuery.select(em, new FindQualifiers(), businessKeysFound,
null, null, null);
- result.setBusinessInfos(new
org.uddi.api_v3.BusinessInfos());
-
- for (Object item : queryResults) {
- org.apache.juddi.model.BusinessEntity
modelBusinessEntity = (org.apache.juddi.model.BusinessEntity)item;
- org.uddi.api_v3.BusinessInfo apiBusinessInfo =
new org.uddi.api_v3.BusinessInfo();
-
-
MappingModelToApi.mapBusinessInfo(modelBusinessEntity, apiBusinessInfo);
+ if (queryResults.size() > 0) {
+ result.setBusinessInfos(new
org.uddi.api_v3.BusinessInfos());
-
result.getBusinessInfos().getBusinessInfo().add(apiBusinessInfo);
+ for (Object item : queryResults) {
+ org.apache.juddi.model.BusinessEntity
modelBusinessEntity = (org.apache.juddi.model.BusinessEntity)item;
+ org.uddi.api_v3.BusinessInfo
apiBusinessInfo = new org.uddi.api_v3.BusinessInfo();
+
+
MappingModelToApi.mapBusinessInfo(modelBusinessEntity, apiBusinessInfo);
+
+
result.getBusinessInfos().getBusinessInfo().add(apiBusinessInfo);
+ }
}
// Sort and retrieve the final results
queryResults = FetchTModelsQuery.select(em, new
FindQualifiers(), tmodelKeysFound, null, null, null);
- result.setTModelInfos(new
org.uddi.api_v3.TModelInfos());
-
- for (Object item : queryResults) {
- org.apache.juddi.model.Tmodel modelTModel =
(org.apache.juddi.model.Tmodel)item;
- org.uddi.api_v3.TModelInfo apiTModelInfo = new
org.uddi.api_v3.TModelInfo();
-
- MappingModelToApi.mapTModelInfo(modelTModel,
apiTModelInfo);
+ if (queryResults.size() > 0) {
+ result.setTModelInfos(new
org.uddi.api_v3.TModelInfos());
-
result.getTModelInfos().getTModelInfo().add(apiTModelInfo);
+ for (Object item : queryResults) {
+ org.apache.juddi.model.Tmodel
modelTModel = (org.apache.juddi.model.Tmodel)item;
+ org.uddi.api_v3.TModelInfo
apiTModelInfo = new org.uddi.api_v3.TModelInfo();
+
+
MappingModelToApi.mapTModelInfo(modelTModel, apiTModelInfo);
+
+
result.getTModelInfos().getTModelInfo().add(apiTModelInfo);
+ }
}
tx.commit();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
