commit | f04dc223c8c809064185b93145eb11e3b904dd3e | [log] [tgz] |
---|---|---|
author | Guillaume Nodet <gnodet@apache.org> | Tue May 29 19:25:05 2012 +0000 |
committer | Guillaume Nodet <gnodet@apache.org> | Tue May 29 19:25:05 2012 +0000 |
tree | 975d544f2b26a566c5e1c709c1a0fe12cd047b4c | |
parent | c352c19054b11f58a3b8ec6ee013fd95bf081d9c [diff] |
[ARIES-854] Check for null when configuration update() is called to avoid NPE. git-svn-id: https://svn.apache.org/repos/asf/aries/branches/blueprint-0.3.2-fixes/transaction-manager@1343939 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/aries/transaction/Activator.java b/src/main/java/org/apache/aries/transaction/Activator.java index 1a98887..92a8ca1 100644 --- a/src/main/java/org/apache/aries/transaction/Activator.java +++ b/src/main/java/org/apache/aries/transaction/Activator.java
@@ -51,6 +51,12 @@ } 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 {