xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development

Browse source 
Former-commit-id: 3cd286ba60 [formerly 2e7836431e] [formerly 7ec76c0634] [formerly 3cd286ba60 [formerly 2e7836431e] [formerly 7ec76c0634] [formerly 6b4c675600 [formerly 7ec76c0634 [formerly 3054f3682a955395f381d3d9c78728c4a4492b69]]]]
Former-commit-id: 6b4c675600
Former-commit-id: a1eebaaf69 [formerly 3843947a17] [formerly 97c05a8e322561ee200f9573a86e4869891f59bd [formerly 109474aec7]]
Former-commit-id: 07ee2bd6a94af70aacf9328bbcc83f8d24812dc4 [formerly 58cb0638dc]
Former-commit-id: 6a8ab9eacc
This commit is contained in:
Richard Peter 2013-10-23 16:41:57 -05:00 • committed by Gerrit Code Review
commit 0f39acf457
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/plugins/FindAssociatedObjects.java
View file

@ -34,6 +34,7 @@ import oasis.names.tc.ebxml.regrep.xsd.rim.v4.QueryType;
import oasis.names.tc.ebxml.regrep.xsd.rim.v4.RegistryObjectType;
import com.raytheon.uf.common.registry.EbxmlNamespaces;
import com.raytheon.uf.common.util.CollectionUtil;
import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao;
import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException;
import com.raytheon.uf.edex.registry.ebxml.services.query.QueryConstants;
@ -89,6 +90,7 @@ import com.raytheon.uf.edex.registry.ebxml.util.EbxmlExceptionUtil;
* Apr 23, 2013 1910 djohnson Don't allow NPE on registry object list, remove non ANSI Javadoc.
* 5/21/2013 2022 bphillip Set return type on call to findAssociations
* 10/8/2013 1682 bphillip Refactored querying
* 10/23/2013 1682 bphillip Returns empty query result if no ids were found
*
* </pre>
*
@ -163,6 +165,9 @@ public class FindAssociatedObjects extends RegistryQueryPlugin {
}
try {
if (CollectionUtil.isNullOrEmpty(ids)) {
return new QueryResponse();
}
return createResponse(registryObjectDao.getById(ids));
} catch (EbxmlRegistryException e) {
throw EbxmlExceptionUtil.createMsgRegistryException(