aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cummi...@apache.org
Subject svn commit: r1343327 - /aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java
Date Mon, 28 May 2012 17:18:08 GMT
Author: cumminsh
Date: Mon May 28 17:18:08 2012
New Revision: 1343327

URL: http://svn.apache.org/viewvc?rev=1343327&view=rev
Log:
[ARIES-845] Check for null when configuration update() is called to avoid NPE.

Modified:
    aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java

Modified: aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java?rev=1343327&r1=1343326&r2=1343327&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java
(original)
+++ aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java
Mon May 28 17:18:08 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 {



Mime
View raw message