Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-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 946B577D5 for ; Sat, 8 Oct 2011 15:16:21 +0000 (UTC) Received: (qmail 49163 invoked by uid 500); 8 Oct 2011 15:16:21 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 49118 invoked by uid 500); 8 Oct 2011 15:16:20 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 49111 invoked by uid 99); 8 Oct 2011 15:16:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Oct 2011 15:16:20 +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; Sat, 08 Oct 2011 15:16:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8787623888FD for ; Sat, 8 Oct 2011 15:15:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1180386 - /felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java Date: Sat, 08 Oct 2011 15:15:59 -0000 To: commits@felix.apache.org From: clement@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111008151559.8787623888FD@eris.apache.org> Author: clement Date: Sat Oct 8 15:15:59 2011 New Revision: 1180386 URL: http://svn.apache.org/viewvc?rev=1180386&view=rev Log: Applied the patch from Robert Lillack fixing FELIX-2981. Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java?rev=1180386&r1=1180385&r2=1180386&view=diff ============================================================================== --- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java (original) +++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java Sat Oct 8 15:15:59 2011 @@ -303,10 +303,6 @@ public class Property implements FieldIn * @return the default value. */ public Object getDefaultValue() { - if (m_defaultValue == NO_VALUE) { - return getNoValue(m_type); - } - return m_defaultValue; } @@ -364,7 +360,7 @@ public class Property implements FieldIn * @return true if the object is assignable in the property of type 'type'. */ public static boolean isAssignable(Class type, Object value) { - if (value == null || type.isInstance(value)) { // When the value is null, the assign works necessary. + if (value == null || type.isInstance(value) || value == Property.NO_VALUE) { // When the value is null, the assign works necessary. return true; } else if (type.isPrimitive()) { // Manage all boxing types.