Fixed Null Pointer problem in RetailCustomerServiceImpl.

GreenButtonAlliance · Feb 27, 2014 · 4678619 · 4678619
1 parent 4fc61a0
commit 4678619
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/org/energyos/espi/common/service/impl/RetailCustomerServiceImpl.java b/src/main/java/org/energyos/espi/common/service/impl/RetailCustomerServiceImpl.java
@@ -154,14 +154,16 @@ public Subscription associateByUUID(Long retailCustomerId, UUID uuid) {
 
        try {
     	   retailCustomer = resourceService.findById(retailCustomerId, RetailCustomer.class);
-
-    	   usagePoint = resourceService.findByUUID(uuid, UsagePoint.class);
-
-           if (usagePoint == null) {
+           try {
+
+    	       usagePoint = resourceService.findByUUID(uuid, UsagePoint.class);
+
+           } catch (Exception e) {
 
         	   usagePoint = new UsagePoint();
         	   usagePoint.setUUID(uuid);
         	   usagePoint.setDescription("A Temporary UsagePoint Description");
+        	   usagePoint.setServiceCategory(new ServiceCategory(ServiceCategory.ELECTRICITY_SERVICE))	;
         	   resourceService.persist(usagePoint);
 
            }