[jboss-svn-commits] JBL Code SVN: r8068 - in labs/jbossesb/trunk/product/core/services: src/org/jboss/internal/soa/esb/services/registry tests/src/org/jboss/internal/soa/esb/services/registry

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2006-12-05 12:01:53 -0500 (Tue, 05 Dec 2006)
New Revision: 8068

Modified:
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
Log:
Adding workaround for scout bug.

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2006-12-05 15:17:11 UTC (rev 8067)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2006-12-05 17:01:53 UTC (rev 8068)
@@ -237,14 +237,22 @@
 		//first find the ServiceBindings for this service
 		try {
 			Service service = findService(category, serviceName);
-			Collection<ServiceBinding> serviceBindings = findServiceBindings(service);
+			Collection serviceBindings = findServiceBindings(service);
+			service.addServiceBindings(serviceBindings);
 			for (Iterator i=serviceBindings.iterator();i.hasNext();){
 				ServiceBinding serviceBinding = (ServiceBinding) i.next();
 				String xml = URLDecoder.decode(serviceBinding.getAccessURI(), "UTF-8");
 				if (xml.equals(EPRHelper.toXMLString(toBeDeletedEPR))) {
 					service.removeServiceBinding(serviceBinding);
+					i.remove();
 					service.setProvidingOrganization(getJBossESBOrganization());
 					saveRegistryObject(service);
+					//adding the other bindings back in. Workaround for this scout bug.
+					for (Iterator j=serviceBindings.iterator();i.hasNext();){
+						serviceBinding = (ServiceBinding) i.next();
+						serviceBinding.setKey(null);
+						saveRegistryObject(serviceBinding);
+					}
 					return;
 				}
 			}

Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java	2006-12-05 15:17:11 UTC (rev 8067)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java	2006-12-05 17:01:53 UTC (rev 8068)
@@ -133,6 +133,9 @@
 			JAXRRegistryImpl registry = new JAXRRegistryImpl();
 			registry.registerEPR("registry", "Registry Test ServiceName", "Registry Test Service Description",
 					epr, "EPR description");
+			registry.registerEPR("registry", "Registry Test ServiceName", "Registry Test Service Description",
+					epr, "EPR description");
+			registry.unRegisterEPR("registry", "Registry Test ServiceName", epr);
 		} catch (RegistryException re) {
 			logger.log(Priority.ERROR, re.getLocalizedMessage(), re);
 			assertTrue(false);