commit f98415b13e7bfead97e7728ebeffa8b3b6822fc9
author Kurt Stam <kstam@apache.org> Fri Jul 24 03:06:06 2009 +0000
committer Kurt Stam <kstam@apache.org> Fri Jul 24 03:06:06 2009 +0000
tree 4729221d3bde768a13a1a37f6f6cde54bcd4df17
parent 38b388a47be95bea19d152a8ce549421ee2886fb

SCOUT-76 orgKey could be null. If it is, we should return null rather than throwing a JAXRException.

git-svn-id: https://svn.apache.org/repos/asf/webservices/scout/branches/v1.1/scout@797315 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java

diff --git a/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java b/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java
index 1da8b1d..f641f9b 100644
--- a/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java
+++ b/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java
@@ -82,6 +82,7 @@
         	} else {

         		RegistryService rs = super.getLifeCycleManager().getRegistryService();

         		BusinessQueryManager bqm = rs.getBusinessQueryManager();

+        		if (orgKey==null) return null;

                 Organization o = (Organization) bqm.getRegistryObject(orgKey,

                         LifeCycleManager.ORGANIZATION);

                 setProvidingOrganization(o);