Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 62513 invoked from network); 7 Sep 2007 20:45:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Sep 2007 20:45:42 -0000 Received: (qmail 33561 invoked by uid 500); 7 Sep 2007 20:45:36 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 33534 invoked by uid 500); 7 Sep 2007 20:45:36 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 33525 invoked by uid 99); 7 Sep 2007 20:45:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Sep 2007 13:45:36 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Sep 2007 20:46:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D59B81A983A; Fri, 7 Sep 2007 13:45:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r573694 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java Date: Fri, 07 Sep 2007 20:45:11 -0000 To: commits@roller.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070907204511.D59B81A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: snoopdave Date: Fri Sep 7 13:45:11 2007 New Revision: 573694 URL: http://svn.apache.org/viewvc?rev=573694&view=rev Log: Fix for "Unexpected Exception occurs when user clicks decline to join a group weblog" http://opensource.atlassian.com/projects/roller/browse/ROL-1552 Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java?rev=573694&r1=573693&r2=573694&view=diff ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java Fri Sep 7 13:45:11 2007 @@ -91,12 +91,14 @@ UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager(); WeblogPermission perms = userMgr.getPermissions(getInviteId()); if (perms != null) { + String handle = perms.getWebsite().getHandle(); + // TODO ROLLER_2.0: notify inviter that invitee has declined invitation // TODO EXCEPTIONS: better exception handling here userMgr.removePermissions(perms); WebloggerFactory.getWeblogger().flush(); - addMessage("yourWebsites.declined", perms.getWebsite().getHandle()); + addMessage("yourWebsites.declined", handle); } else { addError("yourWebsites.permNotFound"); }