Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-09-30 07:37:31 +02:00
Code Issues Projects Releases Wiki Activity

fixed indenation

Browse Source
This commit is contained in:
TheCutter 2014-04-19 15:53:15 +02:00
parent f00352cde0
commit 1537fc879e
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java
View File

@ -74,15 +74,15 @@ public MySQLDatabase(ConfigurationManager config, String world, Logger logger) t
PreparedStatement verTest = null; PreparedStatement verTest = null;
try { try {
// Test if the database is up to date, if not throw a critical error // Test if the database is up to date, if not throw a critical error
verTest = this.conn.prepareStatement( verTest = this.conn.prepareStatement(
"SELECT `world_id` FROM `region_cuboid` LIMIT 0,1;" "SELECT `world_id` FROM `region_cuboid` LIMIT 0,1;"
); );
verTest.execute(); verTest.execute();
} catch (SQLException ex) { } catch (SQLException ex) {
throw new InvalidTableFormatException( throw new InvalidTableFormatException(
"region_storage_update_20110325.sql" "region_storage_update_20110325.sql"
); );
} finally { } finally {
closeResource(verTest); closeResource(verTest);
} }
@ -142,20 +142,20 @@ public MySQLDatabase(ConfigurationManager config, String world, Logger logger) t
} }
private void connect() throws SQLException { private void connect() throws SQLException {
if (conn != null) { if (conn != null) {
// Check if the connection is still alive/valid. // Check if the connection is still alive/valid.
try { try {
conn.isValid(2); conn.isValid(2);
} catch (SQLException ex) { } catch (SQLException ex) {
// Test if validation failed because the connection is dead, // Test if validation failed because the connection is dead,
// and if it is mark the connection as closed (the MySQL Driver // and if it is mark the connection as closed (the MySQL Driver
// does not ensure that the connection is marked as closed unless // does not ensure that the connection is marked as closed unless
// the close() method has been called. // the close() method has been called.
if ("08S01".equals(ex.getSQLState())) { if ("08S01".equals(ex.getSQLState())) {
conn.close(); conn.close();
} }
} }
} }
if (conn == null || conn.isClosed()) { if (conn == null || conn.isClosed()) {
conn = DriverManager.getConnection(config.sqlDsn, config.sqlUsername, config.sqlPassword); conn = DriverManager.getConnection(config.sqlDsn, config.sqlUsername, config.sqlPassword);
} }
@ -1169,7 +1169,7 @@ public Map<String, ProtectedRegion> getRegions() {
public void setRegions(Map<String, ProtectedRegion> regions) { public void setRegions(Map<String, ProtectedRegion> regions) {
this.regions = regions; this.regions = regions;
} }
protected Object sqlUnmarshal(String rawValue) { protected Object sqlUnmarshal(String rawValue) {
try { try {
return yaml.load(rawValue); return yaml.load(rawValue);
@ -1177,7 +1177,7 @@ protected Object sqlUnmarshal(String rawValue) {
return String.valueOf(rawValue); return String.valueOf(rawValue);
} }
} }
protected String sqlMarshal(Object rawObject) { protected String sqlMarshal(Object rawObject) {
return yaml.dump(rawObject); return yaml.dump(rawObject);
} }