| commit | 285034f993725b7f17199242a5e2a4b4039746fb | [log] [tgz] |
|---|---|---|
| author | Stuart McCulloch <mcculls@apache.org> | Tue Jun 12 12:41:16 2012 +0000 |
| committer | Stuart McCulloch <mcculls@apache.org> | Tue Jun 12 12:41:16 2012 +0000 |
| tree | 95135d23dbe39816f411f96b0c6d75ff3b6ee57c | |
| parent | 8a46193282b3e806b84bfa57c68a23ca068dec63 [diff] [blame] |
Apply latest bnd code git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1349301 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/lib/json/ObjectHandler.java b/bundleplugin/src/main/java/aQute/lib/json/ObjectHandler.java index fc6f6bd..2a876a4 100644 --- a/bundleplugin/src/main/java/aQute/lib/json/ObjectHandler.java +++ b/bundleplugin/src/main/java/aQute/lib/json/ObjectHandler.java
@@ -95,7 +95,8 @@ if (f != null) { // We have a field and thus a type Object value = r.codec.decode(f.getGenericType(), r); - f.set(targetObject, value); + if ( value != null || !r.codec.ignorenull) + f.set(targetObject, value); } else { // No field, but may extra is defined if (extra == null) {