juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r827571 - in /webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl: InquiryHelper.java UDDISubscriptionImpl.java
Date Tue, 20 Oct 2009 14:36:22 GMT
Author: kstam
Date: Tue Oct 20 14:36:22 2009
New Revision: 827571

URL: http://svn.apache.org/viewvc?rev=827571&view=rev
Log:
JUDDI-240 fixing NPE issue with Scout interaction

Modified:
    webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
    webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java

Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java?rev=827571&r1=827570&r2=827571&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
(original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
Tue Oct 20 14:36:22 2009
@@ -344,10 +344,6 @@
 				subscriptionStartIndex.value = null;
 		}
 		
-		if (result.getServiceInfos()==null || result.getServiceInfos().getServiceInfo().size()==0)
{
-			return null;
-		}
-		
 		return result;
 	}
 

Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java?rev=827571&r1=827570&r2=827571&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
(original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
Tue Oct 20 14:36:22 2009
@@ -330,7 +330,9 @@
 	
 					ServiceList serviceList = InquiryHelper.getServiceListFromKeys(fs, findQualifiers, em,
currentMatchingKeys,
 																				   startPointDate, endPointDate, subscriptionStartIndex, modelSubscription.getMaxEntities());
-	
+					if (serviceList.getServiceInfos().getServiceInfo().size()==0) {
+						serviceList=null;
+					}
 					// Upon exiting above function, if more results are to be had, the subscriptionStartIndex
will contain the latest value (or null
 					// if no more results)
 					chunkData = subscriptionStartIndex.value;



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org


Mime
View raw message