Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 43701 invoked from network); 3 Sep 2008 22:26:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Sep 2008 22:26:17 -0000 Received: (qmail 95680 invoked by uid 500); 3 Sep 2008 22:26:15 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 95654 invoked by uid 500); 3 Sep 2008 22:26:15 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 95645 invoked by uid 99); 3 Sep 2008 22:26:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 15:26:15 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 22:25:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B9CB323889C1; Wed, 3 Sep 2008 15:25:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691808 - /incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java Date: Wed, 03 Sep 2008 22:25:25 -0000 To: sling-commits@incubator.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080903222525.B9CB323889C1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Wed Sep 3 15:25:25 2008 New Revision: 691808 URL: http://svn.apache.org/viewvc?rev=691808&view=rev Log: Prevent ClassCastException when a servlet's name has to be deduced from the service ID Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java?rev=691808&r1=691807&r2=691808&view=diff ============================================================================== --- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java (original) +++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java Wed Sep 3 15:25:25 2008 @@ -118,7 +118,10 @@ String servletName = null; for (int i = 0; i < NAME_PROPERTIES.length && (servletName == null || servletName.length() == 0); i++) { - servletName = (String) reference.getProperty(NAME_PROPERTIES[i]); + Object prop = reference.getProperty(NAME_PROPERTIES[i]); + if (prop != null) { + servletName = String.valueOf(prop); + } } return servletName; }