Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 44761 invoked from network); 1 Dec 2006 19:54:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Dec 2006 19:54:38 -0000 Received: (qmail 52318 invoked by uid 500); 1 Dec 2006 19:54:45 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 52176 invoked by uid 500); 1 Dec 2006 19:54:44 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 52132 invoked by uid 99); 1 Dec 2006 19:54:44 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Dec 2006 11:54:44 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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, 01 Dec 2006 11:54:34 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id C7C761A984E; Fri, 1 Dec 2006 11:53:55 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r481361 - /portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java Date: Fri, 01 Dec 2006 19:53:55 -0000 To: jetspeed-dev@portals.apache.org From: smilek@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061201195355.C7C761A984E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: smilek Date: Fri Dec 1 11:53:54 2006 New Revision: 481361 URL: http://svn.apache.org/viewvc?view=rev&rev=481361 Log: get rid of NPE when PortletDefinition cannot be obtained Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java?view=diff&rev=481361&r1=481360&r2=481361 ============================================================================== --- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java (original) +++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java Fri Dec 1 11:53:54 2006 @@ -214,7 +214,7 @@ { PortletDefinition portletDef = registry.getPortletDefinitionByUniqueName( portletName ); - if ( portletIcons != null ) + if ( portletDef != null && portletIcons != null ) { ParameterSet paramSet = portletDef.getInitParameterSet(); Parameter iconParam = paramSet.get( "portlet-icon" ); @@ -223,6 +223,10 @@ { portletIcons.put( frag.getId(), iconParamVal ); } + } + else if ( portletDef == null ) + { + log.error( "GetPageAction could not obtain PortletDefinition for portlet " + portletName ); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org