java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
New commits: commit b18c0624534640b1296d2f7cd7233fb0d30beb6a Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 23 09:42:16 2013 +0200
update proxy.listAvailableProxyChannels API as we cannot transfer null via xmlrpc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java index 0d05df7..6ca829d 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java @@ -28,6 +28,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.InvalidProxyVersionException; import com.redhat.rhn.frontend.xmlrpc.MethodInvalidParamException; +import com.redhat.rhn.frontend.xmlrpc.NoSuchSystemException; import com.redhat.rhn.frontend.xmlrpc.ProxyAlreadyRegisteredException; import com.redhat.rhn.frontend.xmlrpc.ProxyNeedProvisioningException; import com.redhat.rhn.frontend.xmlrpc.ProxyNotActivatedException; @@ -289,8 +290,9 @@ public class ProxyHandler extends BaseHandler { catch (SAXException e) { log.error("Problem parsing certificate", e); } + if (server == null) { - return null; + throw new NoSuchSystemException(); }
ChannelFamily proxyFamily = ChannelFamilyFactory @@ -298,13 +300,14 @@ public class ProxyHandler extends BaseHandler { .PROXY_CHANNEL_FAMILY_LABEL, null);
+ List<String> returnList = new ArrayList<String>(); + if (proxyFamily == null || proxyFamily.getChannels() == null || proxyFamily.getChannels().isEmpty()) { - return null; + return returnList; }
- List<String> returnList = new ArrayList<String>(); /* We search for a proxy channel whose parent channel is our server's basechannel. * This will be the channel we attempt to subscribe the server to. */
spacewalk-commits@lists.fedorahosted.org