Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMykola Nikishov2015-10-11 06:06:51 -0400
committerMykola Nikishov2015-10-19 16:42:16 -0400
commit78844f9e5fd4b51fb1e43bd0317b7cb2e9d38d58 (patch)
tree931864af964b6ca907ba22c46b91173224a4120b /bundles/org.eclipse.equinox.p2.engine/src
parent8449f44a59706525f0c275dca3d1cdb420202ba0 (diff)
downloadrt.equinox.p2-78844f9e5fd4b51fb1e43bd0317b7cb2e9d38d58.tar.gz
rt.equinox.p2-78844f9e5fd4b51fb1e43bd0317b7cb2e9d38d58.tar.xz
rt.equinox.p2-78844f9e5fd4b51fb1e43bd0317b7cb2e9d38d58.zip
Prevent NPE in DebugHelper's formatParameters methodI20151110-0800
Change-Id: I816a68305ec086da8bfd9b7ec179ece6af35b52e Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.engine/src')
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java
index 58c9fdbac..98b2ee0b0 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java
@@ -160,7 +160,9 @@ public class DebugHelper {
buffer.append(key);
buffer.append('=');
Object value = e.getValue();
- if (value instanceof String || value instanceof File || value instanceof Operand || value instanceof IArtifactKey || value instanceof IInstallableUnit)
+ if (value == null)
+ buffer.append(value);
+ else if (value instanceof String || value instanceof File || value instanceof Operand || value instanceof IArtifactKey || value instanceof IInstallableUnit)
buffer.append(value);
else if (value instanceof IProfile)
buffer.append(((IProfile) value).getProfileId());

Back to the top