From 791e43d4f275a17a1d08c714ba9bf12045147c54 Mon Sep 17 00:00:00 2001 From: Adam R Claxton Date: Tue, 18 Apr 2017 22:13:33 -0400 Subject: [PATCH] Fixed a properties error I caused eariler --- src/database/TicketQueries.java | 4 ++++ src/utilities/Mail.java | 2 +- src/utilities/NotificationQueue.java | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/database/TicketQueries.java b/src/database/TicketQueries.java index 781117a..582742e 100644 --- a/src/database/TicketQueries.java +++ b/src/database/TicketQueries.java @@ -79,6 +79,10 @@ public static void acceptTicket(int ticketid, int deviceid, int locationid, int Statement stmt = connect.createStatement(); long milliseconds = new java.util.Date().getTime(); stmt.executeUpdate("UPDATE ticket, devices SET ticket.Status = \"Approved\", devices.Ticket_ID = " + ticketid + ", devices.Status = \"Shipped\", devices.Renter = " + sso + ", devices.Location = " + locationid + " WHERE ticket.Ticket_ID = " + ticketid + " AND devices.Device_ID = " + deviceid); + + // We also need to update ticket's STD field (the one with the date of its last modification) ++ String query = "UPDATE ticket SET Status_Date_Fields = "+milliseconds+" WHERE Ticket_ID = "+ticketid+";"; ++ stmt.executeQuery(query); stmt.close(); connect.close(); } diff --git a/src/utilities/Mail.java b/src/utilities/Mail.java index 10ee409..61cbc6e 100644 --- a/src/utilities/Mail.java +++ b/src/utilities/Mail.java @@ -50,7 +50,7 @@ public void sendTicketConfirmation(int[] ticketIDs) throws IOException, Interrup } msg=msg.replace("{TICKETS GO HERE}",tickethtml); Properties properties = System.getProperties(); - // properties = setProp(sender, client.getEmail()); + properties = setProp(sender, client.getEmail()); Session session = Session.getInstance(properties, new Authenticator() { protected PasswordAuthentication getPasswordAuthentication(){ return new PasswordAuthentication(sender, password); diff --git a/src/utilities/NotificationQueue.java b/src/utilities/NotificationQueue.java index ff38932..ea5c00a 100644 --- a/src/utilities/NotificationQueue.java +++ b/src/utilities/NotificationQueue.java @@ -32,6 +32,7 @@ public void run(){ if(threadArray[i].getName().equals(threadName)) match=true; } if(match){ + System.out.println("Redundant notification queue thread will terminat"e); return; //should kill thread } else{