Skip to content

fix npe on ContainerConfig.getExposedPorts #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 2 commits into from
Jan 30, 2016
Merged

fix npe on ContainerConfig.getExposedPorts #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edfa297
fix npe on ContainerConfig.getExposedPorts
rfhayashi Jan 25, 2016
bbe940f
added test case for ContainerConfig.getExposedPorts
rfhayashi Jan 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ public class ContainerConfig {

@JsonIgnore
public ExposedPort[] getExposedPorts() {
return exposedPorts.getExposedPorts();
if (exposedPorts == null) {
return new ExposedPort[0];
} else {
return exposedPorts.getExposedPorts();
}
}

public boolean isNetworkDisabled() {
Expand Down
43 changes: 43 additions & 0 deletions src/test/java/com/github/dockerjava/api/model/ContainerConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.databind.ObjectMapper;
import org.testng.annotations.Test;

import java.io.IOException;

import static junit.framework.Assert.assertEquals;

public class ContainerConfigTest {

@Test
public void missingExposedPortsReturnEmptyArray() throws IOException {
String s = "{}";
ObjectMapper objectMapper = new ObjectMapper();
ContainerConfig config = objectMapper.readValue(s, ContainerConfig.class);
assertEquals(0, config.getExposedPorts().length);
}

@Test
public void nullExposedPortsReturnEmptyArray() throws IOException {
String s = "{\"ExposedPorts\": null}";
ObjectMapper objectMapper = new ObjectMapper();
ContainerConfig config = objectMapper.readValue(s, ContainerConfig.class);
assertEquals(0, config.getExposedPorts().length);
}

@Test
public void exposedPortsReturnArray() throws IOException {
String s = "{\"ExposedPorts\": {\"22/tcp\": {}, \"80/tcp\": {}}}";
ObjectMapper objectMapper = new ObjectMapper();
ContainerConfig config = objectMapper.readValue(s, ContainerConfig.class);
ExposedPort[] ports = config.getExposedPorts();
assertEquals(2, ports.length);
ExposedPort port22tcp = ports[0];
assertEquals(22, port22tcp.getPort());
assertEquals(InternetProtocol.TCP, port22tcp.getProtocol());
ExposedPort port80tcp = ports[1];
assertEquals(80, port80tcp.getPort());
assertEquals(InternetProtocol.TCP, port80tcp.getProtocol());
}

}