Merge branch 'stable-2.6'

* stable-2.6:
  Migration v57 setInt parameter trivial fix
  Disable closing idle Ssh connections again
This commit is contained in:
Shawn Pearce
2013-04-08 09:46:24 -07:00
3 changed files with 27 additions and 1 deletions

View File

@@ -125,7 +125,7 @@ public class Schema_57 extends SchemaVersion {
}
AccountGroup batch = db.accountGroups().get(sc.batchUsersGroupId);
stmt.setInt(0, sc.batchUsersGroupId.get());
stmt.setInt(1, sc.batchUsersGroupId.get());
if (batch != null
&& db.accountGroupMembers().byGroup(sc.batchUsersGroupId).toList().isEmpty()
&& stmt.executeQuery().first() != false) {