From df61c116c80b0eaf215a5e52aac01e76e9e6a24a Mon Sep 17 00:00:00 2001
From: oguzcagiran <oguzcagiran@gmail.com>
Date: Fri, 24 Feb 2017 20:46:43 +0300
Subject: [PATCH] fix #224 null user when invalid pet form

---
 .../springframework/samples/petclinic/owner/PetController.java  | 1 +
 src/main/resources/templates/pets/createOrUpdatePetForm.html    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
index 0599faf2c..76df94345 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
@@ -105,6 +105,7 @@ class PetController {
         if (result.hasErrors()) {
             pet.setOwner(owner);
             model.put("pet", pet);
+            model.put("owner", owner);
             return VIEWS_PETS_CREATE_OR_UPDATE_FORM;
         } else {
             owner.addPet(pet);
diff --git a/src/main/resources/templates/pets/createOrUpdatePetForm.html b/src/main/resources/templates/pets/createOrUpdatePetForm.html
index bfa07d1ff..30ea9f5ea 100644
--- a/src/main/resources/templates/pets/createOrUpdatePetForm.html
+++ b/src/main/resources/templates/pets/createOrUpdatePetForm.html
@@ -13,7 +13,7 @@
       <div class="form-group">
         <label class="col-sm-2 control-label">Owner</label>
         <div class="col-sm-10">
-          <span th:text="${pet.owner?.firstName + ' ' + pet.owner?.lastName}" />
+          <span th:text="${owner.firstName + ' ' + owner.lastName}" />
         </div>
       </div>
       <input