diff options
| author | slewis | 2015-11-24 02:29:29 +0000 |
|---|---|---|
| committer | slewis | 2015-11-24 02:29:29 +0000 |
| commit | f952a7b6054e4e01cd06126ec670bc80173ceb5d (patch) | |
| tree | 4cb40a4068bc216c23f430913deec6f81a774af2 /osgi | |
| parent | b4e0dc97bbec3add3378ae36c8d3b82355cfad4e (diff) | |
| download | org.eclipse.ecf-f952a7b6054e4e01cd06126ec670bc80173ceb5d.tar.gz org.eclipse.ecf-f952a7b6054e4e01cd06126ec670bc80173ceb5d.tar.xz org.eclipse.ecf-f952a7b6054e4e01cd06126ec670bc80173ceb5d.zip | |
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=482865
Change-Id: I9aa44c52ce7ed4c167787270fffd73d76bae543f
Diffstat (limited to 'osgi')
| -rw-r--r-- | osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/PropertiesUtil.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/PropertiesUtil.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/PropertiesUtil.java index ecc23c1e6..adca1ffa4 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/PropertiesUtil.java +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/PropertiesUtil.java @@ -340,6 +340,7 @@ public class PropertiesUtil { public static Map<String, Object> copySerializableProperties(Map<String, ?> source, Map<String, Object> target) { + if (source == null) return target; for (String key : source.keySet()) { Object value = source.get(key); try { |