fix adding dups
This commit is contained in:
@@ -30,6 +30,7 @@ public class AccountList extends ArrayList<Account> {
|
||||
}
|
||||
}
|
||||
} catch (DuplicateObjectException e) {
|
||||
System.out.println(String.format("%s", e.getMessage()));
|
||||
return false;
|
||||
}
|
||||
return super.add(account);
|
||||
|
||||
@@ -18,6 +18,8 @@ class AccountReservationList extends ArrayList<IReservation> {
|
||||
@Override
|
||||
public synchronized boolean add(final IReservation reservation) throws RuntimeException {
|
||||
boolean result = true;
|
||||
((Reservation) reservation)
|
||||
.setReservation_number(AccountReservationList.reservationSerial((Reservation) reservation));
|
||||
Reservation rsrv = this.find(reservation.getReservation_number());
|
||||
result = rsrv == null;
|
||||
if (!result) {
|
||||
@@ -27,8 +29,6 @@ class AccountReservationList extends ArrayList<IReservation> {
|
||||
result = ((IReservation) reservation).checkValid();
|
||||
|
||||
if (result) {
|
||||
((Reservation) reservation)
|
||||
.setReservation_number(AccountReservationList.reservationSerial((Reservation) reservation));
|
||||
((Reservation) reservation).setPrice(reservation.calculatePrice());
|
||||
result = super.add(reservation);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user