#477 Make updateSession() timestamp-aware; fetch timestamp safely

src/main/java/fr/xephi/authme/datasource/MySQL.java

@@ -587,14 +587,14 @@ public class MySQL implements DataSource {
                 + columnIp + "=?, " + columnLastLogin + "=?, " + columnRealName + "=? WHERE " + columnName + "=?;";
             PreparedStatement pst = con.prepareStatement(sql);
             pst.setString(1, auth.getIp());
-            pst.setLong(2, auth.getLastLogin());
+            pst.setTimestamp(2, new Timestamp(auth.getLastLogin()));
             pst.setString(3, auth.getRealName());
             pst.setString(4, auth.getNickname());
             pst.executeUpdate();
             pst.close();
             return true;
         } catch (SQLException ex) {
-            ConsoleLogger.showError(ex.getMessage());
+            logSqlException(ex);
         }
         return false;
     }
@@ -985,7 +985,7 @@ public class MySQL implements DataSource {
             .name(row.getString(columnName))
             .realName(row.getString(columnRealName))
             .password(row.getString(columnPassword), salt)
-            .lastLogin(row.getTimestamp(columnLastLogin).getTime())
+            .lastLogin(safeGetTimestamp(row))
             .ip(row.getString(columnIp))
             .locWorld(row.getString(lastlocWorld))
             .locX(row.getDouble(lastlocX))
@@ -996,6 +996,21 @@ public class MySQL implements DataSource {
             .build();
     }
 
+    /**
+     * Retrieve the last login timestamp in a safe way.
+     *
+     * @param row The ResultSet to read
+     * @return The timestamp (as number of milliseconds since 1970-01-01 00:00:00 GMT)
+     */
+    private long safeGetTimestamp(ResultSet row) {
+        try {
+            return row.getTimestamp(columnLastLogin).getTime();
+        } catch (SQLException e) {
+            ConsoleLogger.logException("Could not get timestamp from resultSet. Defaulting to current time", e);
+        }
+        return System.currentTimeMillis();
+    }
+
     private void migrateLastLoginColumnToTimestamp(Connection con, ResultSet rs) throws SQLException {
         final int columnType = rs.getInt("DATA_TYPE");
         if (columnType == Types.BIGINT) {

src/main/java/fr/xephi/authme/settings/properties/SettingsFieldRetriever.java

@@ -19,9 +19,9 @@ public final class SettingsFieldRetriever {
 
     /** The classes to scan for properties. */
     private static final List<Class<? extends SettingsClass>> CONFIGURATION_CLASSES = Arrays.asList(
-        ConverterSettings.class,    PluginSettings.class,  RestrictionSettings.class,
+        DatabaseSettings.class,     ConverterSettings.class, PluginSettings.class,
-        DatabaseSettings.class,     EmailSettings.class,   HooksSettings.class,
+        RestrictionSettings.class,  EmailSettings.class,     HooksSettings.class,
-        ProtectionSettings.class,   PurgeSettings.class,   SecuritySettings.class,
+        ProtectionSettings.class,   PurgeSettings.class,     SecuritySettings.class,
         RegistrationSettings.class, BackupSettings.class);
 
     private SettingsFieldRetriever() {