java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 3
++-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 7
++-----
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit acd31b390050f8f6eee6edcb316304b6bf1121e0
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 22 11:40:05 2010 -0400
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
index 7558298..235a75a 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
@@ -158,7 +158,8 @@ class ConnectionManager {
String dbName = Config.get().getString("db_name");
if (ConfigDefaults.get().isOracle()) {
connectionUrl += "@" + dbName;
- } else {
+ }
+ else {
String dbHost = Config.get().getString("db_host");
String dbPort = Config.get().getString("db_port");
if (dbHost != null && dbHost.length() > 0) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
index a9e0ce7..a0b1dda 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
@@ -23,7 +23,6 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
-import com.redhat.rhn.frontend.xmlrpc.org.trusts.OrgTrustHandler;
import com.redhat.rhn.manager.org.MigrationManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -37,7 +36,6 @@ import org.apache.struts.action.DynaActionForm;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -53,8 +51,6 @@ public class SystemMigrateAction extends RhnAction {
public static final String SID = "sid";
public static final String ORG = "to_org";
- private OrgTrustHandler handler = new OrgTrustHandler();
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping, ActionForm form,
@@ -172,7 +168,8 @@ public class SystemMigrateAction extends RhnAction {
List<Server> serverList = new ArrayList<Server>();
serverList.add(s);
- List<Long> serversMigrated = MigrationManager.migrateServers(user, toOrg,
serverList);
+ List<Long> serversMigrated = MigrationManager.migrateServers(user,
+ toOrg, serverList);
Iterator it = serversMigrated.iterator();
Long value = (Long)it.next();
Show replies by date