1 - Null exception in ApplicationInformation.setRegistrationToken

2 - Removed duplicates in the construction of the BatchLists

Author: jateeter

src/main/java/org/energyos/espi/common/domain/ApplicationInformation.java

@@ -1262,7 +1262,11 @@ public java.lang.Object getRegistrationAccessToken() {
     }
 
     private void setRegistrationAccessToken(java.lang.Object registrationAccessToken) {
-	    this.registrationAccessToken = registrationAccessToken.toString();
+    	if (registrationAccessToken != null) {
+	       this.registrationAccessToken = registrationAccessToken.toString();
+    	} else {
+    		this.registrationAccessToken = null;
+    	}
     }
 
     /**

src/main/java/org/energyos/espi/common/service/impl/NotificationServiceImpl.java

@@ -173,8 +173,10 @@ public void notifyAllNeed() {
                           notifyList.get(id).getResources().add(bulkResourceUri);
 			            }
 			    	  } else {
-			    		// just add the resourceUri 
-			    		notifyList.get(id).getResources().add(resourceUri);		
+			    		// just add the resourceUri
+			    		  if (!(notifyList.get(id).getResources().contains(resourceUri))) {
+			    		        notifyList.get(id).getResources().add(resourceUri);	
+			    		  }
 			    	  }
 			    	}
 			    }