Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
08/06/08 17:17:55 (5 months ago)
Author:
mseaton
Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/notification/Alert.java

    r4969 r5183  
    321321         */ 
    322322        public AlertRecipient getRecipient(User recipient) { 
    323                 for (AlertRecipient ar : recipients) { 
    324                         if (ar.getRecipient().equals(recipient)) 
    325                                 return ar; 
    326                 } 
     323                if (getRecipients() != null) 
     324                        for (AlertRecipient ar : recipients) { 
     325                                if (ar.getRecipient().equals(recipient)) 
     326                                        return ar; 
     327                        } 
    327328                return null; 
    328329        }