You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2015/08/19 08:50:11 UTC

[2/4] mina-sshd git commit: Add animal-sniffer plugin and fix a JDK8 call

Add animal-sniffer plugin and fix a JDK8 call

Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/b362b54f
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/b362b54f
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/b362b54f

Branch: refs/heads/master
Commit: b362b54fb2b43741fd460565ad83667c689a5614
Parents: ee8f455
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Aug 19 08:48:34 2015 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Aug 19 08:48:34 2015 +0200

----------------------------------------------------------------------
 pom.xml                                         | 22 +++++++++++++++++++-
 .../sshd/common/future/DefaultSshFuture.java    |  4 +++-
 2 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b362b54f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3991c63..511dc71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -409,7 +409,27 @@
         </pluginManagement>
 
         <plugins>
-           <plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <version>1.14</version>
+                <executions>
+                    <execution>
+                        <id>check-java-api</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <signature>
+                                <groupId>org.codehaus.mojo.signature</groupId>
+                                <artifactId>java17</artifactId>
+                                <version>1.0</version>
+                            </signature>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>1.4</version>

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b362b54f/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
index e6bd532..e950ab2 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
@@ -101,7 +101,9 @@ public class DefaultSshFuture<T extends SshFuture> extends AbstractLoggingBean i
         try {
             return await0(timeoutMillis, false) != null;
         } catch (InterruptedIOException e) {
-            throw new InternalError("Unexpected interrupted exception wile awaitUninterruptibly " + timeoutMillis + " msec.: " + e.getMessage(), e);
+            // TODO for JDK-8 use the 2-args constructors
+            throw (InternalError) new InternalError("Unexpected interrupted exception wile awaitUninterruptibly "
+                    + timeoutMillis + " msec.: " + e.getMessage()).initCause(e);
         }
     }