java/code/src/com/redhat/rhn/domain/server/Server.java | 2 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 53ba9f0c71b85b42b0cefdbefd413f1880444ec6 Author: Tomas Kasparek tkasparek@redhat.com Date: Thu Oct 25 11:52:33 2012 +0200
checkstyle fix
140a0403f422c04363dbf806d377fe1507681e09 caused this (cherry picked from commit 24443cb3cd2956f2450a5790b67a99f4f2ef9bd5)
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index 65c5ffe..77de965 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -106,7 +106,7 @@ public class Server extends BaseDomainHelper implements Identifiable { private Set<VirtualInstance> guests = new HashSet<VirtualInstance>(); private VirtualInstance virtualInstance; private PushClient pushClient; - private final ConfigChannelListProcessor configListProc = + private final ConfigChannelListProcessor configListProc = new ConfigChannelListProcessor(); private Set<ServerHistoryEvent> history; private Set<InstalledPackage> packages; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index 2677bc0..5e67f54 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -618,10 +618,10 @@ public class SystemHandler extends BaseHandler { * @param sessionKey The sessionKey for the logged in user * @param serverIds A list of ids to get info for * @return a list of maps representing the details for the active systems - * + * * @throws FaultException A FaultException is thrown if the user cannot * be found from the session key - * + * * @xmlrpc.doc Given a list of server ids, returns a list of active servers' * details visible to the user. * @xmlrpc.param #param("string", "sessionKey") @@ -631,7 +631,7 @@ public class SystemHandler extends BaseHandler { * #struct("server details") * #prop_desc("int", "id", "The server's id") * #prop_desc("string", "name", "The server's name") - * #prop_desc("dateTime.iso8601", "last_checkin", + * #prop_desc("dateTime.iso8601", "last_checkin", * "Last time server successfully checked in ") * #prop_desc("int", "ram", "The amount of physical memory in MB.") * #prop_desc("int", "swap", "The amount of swap space in MB.") @@ -1776,7 +1776,7 @@ public class SystemHandler extends BaseHandler { * #prop("string", "custom info label") * #struct_end() */ - public Map<String, String> getCustomValues(String sessionKey, Integer sid) + public Map<String, String> getCustomValues(String sessionKey, Integer sid) throws FaultException { // Get the logged in user and server User loggedInUser = getLoggedInUser(sessionKey);
spacewalk-commits@lists.fedorahosted.org