X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/blobdiff_plain/7c07344e6a7261eb01a948c7e1dbb014704f81f7..4a87acb4bdf85240f1c0024aebddcc6f57da4e99:/ruralHouses/src/dataAccess/DB4oManager.java

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index d83f6a9..b46eafa 100644
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -134,15 +134,13 @@ public class DB4oManager {
 	public Offer createOffer(RuralHouse ruralHouse, Date firstDay,
 			Date lastDay, float price) throws RemoteException, Exception {
 		Offer o = null;
-		
+
 		if (c.isDatabaseLocal() == false)
 			openSDB();
 		else
 			openDB();
-		
-		try {
 
-			
+		try {
 
 			RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(),
 					null, null, null, null);
@@ -160,8 +158,8 @@ public class DB4oManager {
 					.println("Error: com.db4o.ext.ObjectNotStorableException in createOffer");
 		} finally {
 			db.close();
-			return o;
 		}
+		return o;
 	}
 
 	public void deleteDB() {
@@ -170,7 +168,7 @@ public class DB4oManager {
 			openSDB();
 		else
 			openDB();
-		
+
 		try {
 			Owner proto = new Owner(null, null);
 			ObjectSet result = db.queryByExample(proto);
@@ -196,14 +194,14 @@ public class DB4oManager {
 	public Booking createBooking(RuralHouse ruralHouse, Date firstDate,
 			Date lastDate, String bookTelephoneNumber)
 			throws OfferCanNotBeBooked {
-		
+
 		if (c.isDatabaseLocal() == false)
 			openSDB();
 		else
 			openDB();
-		
+
 		Booking bok = null;
-		
+
 		try {
 
 			if (c.isDatabaseLocal() == false)
@@ -233,8 +231,9 @@ public class DB4oManager {
 					.println("Error: com.db4o.ext.ObjectNotStorableException in createBooking");
 		} catch (Exception exc) {
 			exc.printStackTrace();
+		} finally {
+			db.close();
 		}
-		db.close();
 		return bok;
 	}
 
@@ -263,7 +262,7 @@ public class DB4oManager {
 
 	public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
 			Exception {
-		
+
 		if (c.isDatabaseLocal() == false)
 			openSDB();
 		else
@@ -283,14 +282,13 @@ public class DB4oManager {
 
 	public boolean existsOverlappingOffer(RuralHouse rh, Date firstDay,
 			Date lastDay) throws RemoteException, OverlappingOfferExists {
-		
+
 		if (c.isDatabaseLocal() == false)
 			openSDB();
 		else
 			openDB();
-		
+
 		try {
-			
 
 			RuralHouse rhn = (RuralHouse) db
 					.queryByExample(
@@ -327,12 +325,12 @@ public class DB4oManager {
 	 */
 	public Vector<Account> getAccount(String usr, String pwd)
 			throws RemoteException, Exception {
-		
+
 		if (c.isDatabaseLocal() == false)
 			openSDB();
 		else
 			openDB();
-		
+
 		try {
 			Account proto = new Account(usr, pwd, new Owner(null, null));
 			ObjectSet<Account> result = db.queryByExample(proto);
@@ -354,7 +352,7 @@ public class DB4oManager {
 			openSDB();
 		else
 			openDB();
-		
+
 		boolean stored = false;
 		RuralHouse house = new RuralHouse(rh.getHouseName(), null, null,
 				null, null);
@@ -376,8 +374,7 @@ public class DB4oManager {
 		if (c.isDatabaseLocal() == false)
 			openSDB();
 		else
-			openDB();
-		
+			openDB();		
 		RuralHouse house = new RuralHouse(houseName, null, null, null, null);
 		try {
 			ObjectSet<RuralHouse> result = db.queryByExample(house);
@@ -401,17 +398,17 @@ public class DB4oManager {
 			openSDB();
 		else
 			openDB();
-		
-		try{
+
+		try {
 			ObjectSet<RuralHouse> result = db.queryByExample(rh);
 			Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
-			while(result.hasNext())
+			while (result.hasNext())
 				ruralHouses.add(result.next());
 			return ruralHouses;
-		}finally{
+		} finally {
 			db.close();
 		}
-		
+
 	}
 	public RuralHouse getRuralHouseByName(String name){
 		RuralHouse rh = new RuralHouse(name,null,null,null,null);