svn commit: r1329154 - /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java

[solomax]

Author: solomax
Date: Mon Apr 23 10:03:02 2012
New Revision: 1329154

URL: http://svn.apache.org/viewvc?rev=1329154&view=rev
Log:
OPENMEETINGS-209 NPE while sending invitation is fixed

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java?rev=1329154&r1=1329153&r2=1329154&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
 Mon Apr 23 10:03:02 2012
@@ -880,9 +880,10 @@ public class Invitationmanagement {
 
                        HashMap<String, String> organizerAttendee = handler
                                        .getAttendeeData(email, username, 
invitor);
+                       String replyToEmail = null;
                        if (user != null) {
-                               organizerAttendee = 
handler.getAttendeeData(user.getAdresses()
-                                               .getEmail(), user.getLogin(), 
invitor);
+                               replyToEmail = user.getAdresses().getEmail();
+                               organizerAttendee = 
handler.getAttendeeData(replyToEmail, user.getLogin(), invitor);
                        }
 
                        GregorianCalendar start = new 
GregorianCalendar(timezone);
@@ -907,7 +908,7 @@ public class Invitationmanagement {
 
                        log.debug(handler.getICalDataAsString());
 
-                       mailiCalThread.doSend(email, 
user.getAdresses().getEmail(), subject, handler.getIcalAsByteArray(),
+                       mailiCalThread.doSend(email, replyToEmail, subject, 
handler.getIcalAsByteArray(),
                                        template);
 
                        return "success";