Username is saved hashed and password hashed and salted

[RRRRHHHH_Code] / ruralHouses / src / domain / RuralHouse.java

diff --git a/ruralHouses/src/domain/RuralHouse.java b/ruralHouses/src/domain/RuralHouse.java
index 02ab6f9..2f846eb 100644 (file)
--- a/ruralHouses/src/domain/RuralHouse.java
+++ b/ruralHouses/src/domain/RuralHouse.java
@@ -91,7 +91,10 @@ public class RuralHouse implements Serializable {
                if (getClass() != obj.getClass())
                        return false;
                RuralHouse other = (RuralHouse) obj;
-               if (houseName != other.houseName)
+               if (houseName == null) {
+                       if (other.houseName != null)
+                               return false;
+               } else if (!houseName.equals(other.houseName))
                        return false;
                return true;
        }
@@ -123,15 +126,8 @@ public class RuralHouse implements Serializable {
        }
 
        public Vector<Offer> getAllOffers() {
-               Vector<Offer> availableOffers = new Vector<Offer>();
-               Iterator<Offer> e = offers.iterator();
-               Offer offer;
-               while (e.hasNext()) {
-                       offer = e.next();
-                       if ((offer.getBooking() == null))
-                               availableOffers.add(offer);
-               }
-               return availableOffers;
+
+               return this.offers;
        }
 
        /**
@@ -171,8 +167,4 @@ public class RuralHouse implements Serializable {
 
        }
 
-       public boolean equals(RuralHouse oRh) {
-               return this.getHouseName().equals(oRh.getHouseName());
-       }
-
 }