Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7F3BEC73D for ; Tue, 29 May 2012 19:25:27 +0000 (UTC) Received: (qmail 79355 invoked by uid 500); 29 May 2012 19:25:27 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 79286 invoked by uid 500); 29 May 2012 19:25:27 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 79278 invoked by uid 99); 29 May 2012 19:25:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 May 2012 19:25:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 29 May 2012 19:25:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4A1552388980; Tue, 29 May 2012 19:25:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1343939 - /aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java Date: Tue, 29 May 2012 19:25:06 -0000 To: commits@aries.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120529192506.4A1552388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Tue May 29 19:25:05 2012 New Revision: 1343939 URL: http://svn.apache.org/viewvc?rev=1343939&view=rev Log: [ARIES-854] Check for null when configuration update() is called to avoid NPE. Modified: aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java Modified: aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java URL: http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java?rev=1343939&r1=1343938&r2=1343939&view=diff ============================================================================== --- aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java (original) +++ aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java Tue May 29 19:25:05 2012 @@ -51,6 +51,12 @@ public class Activator implements Bundle } public synchronized void updated(Dictionary properties) throws ConfigurationException { + if (properties == null) + { + // Use defaults if there's no configuration for us + properties = new Hashtable(); + properties.put(Constants.SERVICE_PID, PID); + } deleted(); manager = new TransactionManagerService(PID, properties, bundleContext); try {