DB server side improved some problems when showing bookings remain

[RRRRHHHH_Code] / ruralHouses / src / businessLogic / LoginManager.java

diff --git a/ruralHouses/src/businessLogic/LoginManager.java b/ruralHouses/src/businessLogic/LoginManager.java
index f3c4600..97dd009 100644 (file)
--- a/ruralHouses/src/businessLogic/LoginManager.java
+++ b/ruralHouses/src/businessLogic/LoginManager.java
@@ -1,6 +1,5 @@
 package businessLogic;
 
-
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;
 import java.util.Vector;
@@ -10,7 +9,6 @@ import common.LoginInterface;
 import dataAccess.DB4oManager;
 import domain.Account;
 
-
 public class LoginManager extends UnicastRemoteObject implements LoginInterface {
 
        /**
@@ -19,7 +17,7 @@ public class LoginManager extends UnicastRemoteObject implements LoginInterface
        private static final long serialVersionUID = 1L;
        DB4oManager dbMngr;
 
-       public LoginManager() throws RemoteException  {
+       public LoginManager() throws RemoteException {
                super();
                try {
                        dbMngr = DB4oManager.getInstance();
@@ -30,18 +28,21 @@ public class LoginManager extends UnicastRemoteObject implements LoginInterface
 
        @Override
        public Account checkCredentials(String usr, String pwd) {
-               Account ac = new Account(SecurityManager.getInstance().calculateHash(usr));
+               Account ac = new Account(SecurityManager.getInstance().calculateHash(
+                               usr));
                try {
                        Vector<Account> account = dbMngr.getAccount(ac);
-                       if (SecurityManager.getInstance().isExpectedPassword(pwd.toCharArray(), account
-                                       .get(0).getSalt(), account.get(0).getPassword())) {
-                               
+                       if (account.isEmpty())
+                               return null;
+                       if (SecurityManager.getInstance().isExpectedPassword(
+                                       pwd.toCharArray(), account.get(0).getSalt(),
+                                       account.get(0).getPassword())) {
+
                                return account.get(0);
                        }
                        return null;
 
                } catch (Exception e) {
-                       // TODO Auto-generated catch block
                        e.printStackTrace();
                }
                return null;