Add some exception handling to the customer registry

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@757191 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 13 insertions, 4 deletions

diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
index 8a55e43fc5..615f0ef1b9 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
+++ b/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
@@ -85,15 +85,24 @@ public class CustomerRegistryImpl implements CustomerRegistry {
         return customers.values();
     }
 
-    public Customer getCustomer(String id) {
-        return customers.get(id);
+    public Customer getCustomer(String id) throws CustomerNotFoundException {
+        Customer customer = customers.get(id);
+        
+        if (customer == null){
+            throw new CustomerNotFoundException("Customer " + id + " not found");
+        }
+        
+        return customer;
     }
 
     public boolean updateCustomer(Customer customer) {
-        Customer current = getCustomer(customer.getId());
-        if (current == null) {
+        Customer current = null;
+        try {
+            current = getCustomer(customer.getId());
+        } catch (Exception ex) {
             return false;
         }
+
         current.setEmail(customer.getEmail());
         current.setName(customer.getName());
         current.setCreditCard(customer.getCreditCard());