Skip to content

Fix issue with jersey and unix domain sockets #697

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 1 commit into from
Sep 10, 2016
Merged

Fix issue with jersey and unix domain sockets #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ target
*.log

#Ignore Test Output
test-output
test-output
/.checkstyle
29 changes: 14 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -67,7 +68,7 @@
<slf4j-api.version>1.7.21</slf4j-api.version>

<bouncycastle.version>1.54</bouncycastle.version>
<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
<junixsocket.version>2.0.4</junixsocket.version>
<guava.version>19.0</guava.version>

<!-- test dependencies -->
Expand Down Expand Up @@ -115,11 +116,15 @@
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>de.gesellix</groupId>
<artifactId>unix-socket-factory</artifactId>
<version>${unix-socket-factory.version}</version>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
<version>${junixsocket.version}</version>
</dependency>
<dependency>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-native-common</artifactId>
<version>${junixsocket.version}</version>
</dependency>

<dependency>
Copy link
Contributor Author

@marcuslinke marcuslinke Sep 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dependency to jnr-unixsocket must be removed...

<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
Expand Down Expand Up @@ -266,13 +271,6 @@
</distributionManagement>

<build>
<!-- <extensions> -->
<!-- <extension> -->
<!-- <groupId>kr.motd.maven</groupId> -->
<!-- <artifactId>os-maven-plugin</artifactId> -->
<!-- <version>1.2.3.Final</version> -->
<!-- </extension> -->
<!-- </extensions> -->
<pluginManagement>
<plugins>

Expand Down Expand Up @@ -419,7 +417,7 @@
<perCoreThreadCount>true</perCoreThreadCount>
<threadCount>1</threadCount>
<groups>integration</groups>
<excludedGroups>integration-auth</excludedGroups>
<excludedGroups>integration-auth</excludedGroups>
<includes>
<include>**/*Test.java</include>
</includes>
Expand Down Expand Up @@ -483,7 +481,8 @@
<failOnViolation>true</failOnViolation>
<logViolationsToConsole>true</logViolationsToConsole>
<linkXRef>false</linkXRef>
<!-- if some IDE has integration and requires other place, propose it -->
<!-- if some IDE has integration and requires other place, propose
it -->
<configLocation>
src/test/resources/checkstyle/checkstyle-config.xml
</configLocation>
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,13 @@ public void onComplete() {

@Override
public void close() throws IOException {
closed = true;
if (stream != null) {
stream.close();
if (!closed) {
closed = true;
if (stream != null) {
stream.close();
}
completed.countDown();
}
completed.countDown();
}

/**
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,12 @@ public int available() throws IOException {
}

public void close() throws IOException {
if (closed) {
return;
}
closed = true;
response.close();
delegate.close();
response.close();
}

public void mark(int readlimit) {
Expand Down
Loading