aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
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 GMT
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 {



Mime
View raw message