felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uiter...@apache.org
Subject svn commit: r1493004 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/multiproperty/Property.java
Date Fri, 14 Jun 2013 09:28:39 GMT
Author: uiterlix
Date: Fri Jun 14 09:28:38 2013
New Revision: 1493004

URL: http://svn.apache.org/r1493004
Log:
Added a null check since the current version fails on Java 1.7 which does not allow null additions
on a TreeSet.

Modified:
    felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/multiproperty/Property.java

Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/multiproperty/Property.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/multiproperty/Property.java?rev=1493004&r1=1493003&r2=1493004&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/multiproperty/Property.java
(original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/multiproperty/Property.java
Fri Jun 14 09:28:38 2013
@@ -59,9 +59,12 @@ public class Property {
 			m_valid = false;
 		}
 		if (this.m_value == null) {
+			// value has not bee set yet
 			this.m_value = value;
 		}
-		m_values.add(value);
+		if (value != null) {
+			m_values.add(value);
+		}
 	}
 	
 	public boolean isNegate() {



Mime
View raw message