Skip to content

Commit eaa67c8

Browse files
ctf: handle null environment
Change-Id: Ieebad19af2e0fd716d2373d563f802934f7a93ae Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
1 parent eba9abf commit eaa67c8

File tree

1 file changed

+9
-4
lines changed
  • ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata

1 file changed

+9
-4
lines changed

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/IOStructGen.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050

5151
import com.google.common.collect.Iterables;
5252
import com.google.gson.JsonElement;
53+
import com.google.gson.JsonObject;
5354

5455
/**
5556
* IOStructGen
@@ -157,11 +158,15 @@ private void parseRoot(ICTFMetadataNode root) throws ParseException {
157158
traceNode = child;
158159
if (child instanceof JsonTraceMetadataNode) {
159160
JsonTraceMetadataNode node = (JsonTraceMetadataNode) child;
160-
Map<String, String> env = new LinkedHashMap<>();
161-
for( Entry<String, JsonElement> entry : node.getEnvironment().entrySet()) {
162-
env.put(entry.getKey(), entry.getValue().toString());
161+
JsonObject environment = node.getEnvironment();
162+
if (environment != null) {
163+
Map<String, String> env = new LinkedHashMap<>();
164+
165+
for (Entry<String, JsonElement> entry : environment.entrySet()) {
166+
env.put(entry.getKey(), entry.getValue().toString());
167+
}
168+
fTrace.setEnvironment(env);
163169
}
164-
fTrace.setEnvironment(env);
165170

166171
}
167172
parseTrace(traceNode);

0 commit comments

Comments
 (0)