Merge branch 'app-subscription-fix-2' into 'master'

Add DAO fix for app schedule subscription

See merge request entgra/carbon-device-mgt!764
revert-70ac1926
Inosh Perara 3 years ago
commit fbe64a026d

@ -1037,7 +1037,7 @@ public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements Subsc
try (PreparedStatement stmt = conn.prepareStatement(sql)) { try (PreparedStatement stmt = conn.prepareStatement(sql)) {
stmt.setString(1, ExecutionStatus.PENDING.toString()); stmt.setString(1, ExecutionStatus.PENDING.toString());
stmt.setBoolean(2, false); stmt.setBoolean(2, false);
stmt.setTimestamp(3, new Timestamp(Calendar.getInstance().getTime().getTime())); stmt.setLong(3, Calendar.getInstance().getTime().getTime() / 1000);
try (ResultSet rs = stmt.executeQuery()) { try (ResultSet rs = stmt.executeQuery()) {
return DAOUtil.loadScheduledSubscriptions(rs); return DAOUtil.loadScheduledSubscriptions(rs);
} }

Loading…
Cancel
Save