[jboss-svn-commits] JBL Code SVN: r26998 - labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/aop.

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

Author: tcunning
Date: 2009-06-17 22:36:23 -0400 (Wed, 17 Jun 2009)
New Revision: 26998

Modified:
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/aop/AOPServer.java
Log:
JBESB-2438
Scout may throw a JAXRException if no parent organization is specified
when you create a service and then try to call getProvidingOrganization on 
a service binding that doesn't have a providing org set and whose parent
service doesn't have an org set.    This is a result of the lazy-loading change.
I've added a null check into the scout code base, for now we'll just catch
the exception in the test and move on.


Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/aop/AOPServer.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/aop/AOPServer.java	2009-06-17 23:12:52 UTC (rev 26997)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/server/aop/AOPServer.java	2009-06-18 02:36:23 UTC (rev 26998)
@@ -29,6 +29,7 @@
 import javax.xml.registry.JAXRException;
 import javax.xml.registry.JAXRResponse;
 import javax.xml.registry.RegistryService;
+import javax.xml.registry.infomodel.Organization;
 import javax.xml.registry.infomodel.Service;
 import javax.xml.registry.infomodel.ServiceBinding;
 
@@ -164,10 +165,17 @@
                 {
                     return "Could not find service associated with binding" ;
                 }
-                if (bindingService.getProvidingOrganization() != null)
-                {
-                    return "FAILED: Organization is present in service binding" ;
-                }
+		try {
+			Organization org = bindingService.getProvidingOrganization();
+                	if (bindingService.getProvidingOrganization() != null)
+                	{
+                    		return "FAILED: Organization is present in service binding" ;
+                	}
+		} catch (JAXRException je) {
+			// Lazy loading changes to scout ServiceImpl may
+			// throw an exception if the parent service's Org
+			// is null - in this case, just move on
+		}
             }
             
             return null ;