You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2004/07/02 16:32:44 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/datastore/jdbc JDBCDataStore.java
sviens 2004/07/02 07:32:44
Modified: src/java/org/apache/juddi/handler ServiceInfoHandler.java
src/java/org/apache/juddi/datastore/jdbc JDBCDataStore.java
Log:
Fix for bug# JUDDI-29. A services businessKey value/attribute was not being included within ServiceInfo instance/element in the processing of find_business.
Revision Changes Path
1.3 +7 -7 ws-juddi/src/java/org/apache/juddi/handler/ServiceInfoHandler.java
Index: ServiceInfoHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/ServiceInfoHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceInfoHandler.java 11 Mar 2004 18:06:17 -0000 1.2
+++ ServiceInfoHandler.java 2 Jul 2004 14:32:44 -0000 1.3
@@ -70,13 +70,13 @@
Element element = parent.getOwnerDocument().createElement(TAG_NAME);
AbstractHandler handler = null;
- String serviceKey = info.getServiceKey();
- if (serviceKey != null)
- element.setAttribute("serviceKey",serviceKey);
-
- String businessKey = info.getBusinessKey();
- if (businessKey != null)
- element.setAttribute("businessKey",businessKey);
+ // required attribute
+ String serviceKey = info.getServiceKey();
+ element.setAttribute("serviceKey",(serviceKey != null) ? serviceKey : "");
+
+ // required attribute
+ String businessKey = info.getBusinessKey();
+ element.setAttribute("businessKey",(businessKey != null) ? businessKey : "");
Vector vector = info.getNameVector();
if ((vector!=null) && (vector.size() > 0))
1.6 +3 -4 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/JDBCDataStore.java
Index: JDBCDataStore.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/JDBCDataStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDBCDataStore.java 4 Jun 2004 13:46:42 -0000 1.5
+++ JDBCDataStore.java 2 Jul 2004 14:32:44 -0000 1.6
@@ -1262,7 +1262,7 @@
info.setBusinessKey(businessKey);
info.setNameVector(BusinessNameTable.select(businessKey,connection));
info.setDescriptionVector(BusinessDescTable.select(businessKey,connection));
- info.setServiceInfos(fetchServiceInfosByBusinessKey(businessKey,false));
+ info.setServiceInfos(fetchServiceInfosByBusinessKey(businessKey));
}
catch(java.sql.SQLException sqlex)
{
@@ -1276,7 +1276,7 @@
/**
*
*/
- private ServiceInfos fetchServiceInfosByBusinessKey(String businessKey,boolean includeBusinessKey)
+ private ServiceInfos fetchServiceInfosByBusinessKey(String businessKey)
throws org.apache.juddi.error.RegistryException
{
Vector serviceInfoVector = new Vector();
@@ -1296,8 +1296,7 @@
// okay, create a new ServiceInfo
ServiceInfo info = new ServiceInfo();
info.setServiceKey(serviceKey);
- if (includeBusinessKey)
- info.setBusinessKey(businessKey);
+ info.setBusinessKey(businessKey);
info.setNameVector(ServiceNameTable.select(serviceKey,connection));
// add this ServiceInfo to the ServiceInfo vector