Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 73685 invoked from network); 2 Dec 2009 10:30:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Dec 2009 10:30:53 -0000 Received: (qmail 97195 invoked by uid 500); 2 Dec 2009 10:30:53 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 97140 invoked by uid 500); 2 Dec 2009 10:30:53 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 97119 invoked by uid 99); 2 Dec 2009 10:30:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 10:30:53 +0000 X-ASF-Spam-Status: No, hits=-2.8 required=5.0 tests=AWL,BAYES_00 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, 02 Dec 2009 10:30:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9D00D238898B; Wed, 2 Dec 2009 10:30:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r886104 - /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java Date: Wed, 02 Dec 2009 10:30:26 -0000 To: commits@sling.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091202103030.9D00D238898B@eris.apache.org> Author: fmeschbe Date: Wed Dec 2 10:30:19 2009 New Revision: 886104 URL: http://svn.apache.org/viewvc?rev=886104&view=rev Log: SLING-1217 Apply patch supplied by Marc Speck (thanks alot) preventing NPE when disablig loggers. Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java?rev=886104&r1=886103&r2=886104&view=diff ============================================================================== --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java Wed Dec 2 10:30:19 2009 @@ -194,6 +194,9 @@ REQUEST_LOG_ENTRY_FORMAT, requestLogName, requestLogType); this.requestLogExit = this.createRequestLoggerService(bundleContext, false, REQUEST_LOG_EXIT_FORMAT, requestLogName, requestLogType); + + this.bindRequestLoggerService(this.requestLogEntry); + this.bindRequestLoggerService(this.requestLogExit); } // prepare the access logger if a name is configured and the @@ -207,12 +210,9 @@ this.accessLog = this.createRequestLoggerService(bundleContext, false, ACCESS_LOG_FORMAT, accessLogName, accessLogType); - } - // finally have the loggers added to the respective lists for later use - this.bindRequestLoggerService(this.requestLogEntry); - this.bindRequestLoggerService(this.requestLogExit); - this.bindRequestLoggerService(this.accessLog); + this.bindRequestLoggerService(this.accessLog); + } } /**