You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2015/10/05 17:06:50 UTC
[1/2] mina git commit: Applied pull request
https://github.com/apache/mina/pull/5
Repository: mina
Updated Branches:
refs/heads/2.0 e81c0eb01 -> 965d9b76a
Applied pull request https://github.com/apache/mina/pull/5
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/0c090ed1
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/0c090ed1
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/0c090ed1
Branch: refs/heads/2.0
Commit: 0c090ed193d4bea7d5cca5fedb8ba4acb1f8fc79
Parents: e81c0eb
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Oct 5 16:54:04 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Oct 5 16:54:04 2015 +0200
----------------------------------------------------------------------
mina-transport-apr/pom.xml | 4 ++--
.../java/org/apache/mina/transport/socket/apr/AprLibrary.java | 4 ++--
pom.xml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/0c090ed1/mina-transport-apr/pom.xml
----------------------------------------------------------------------
diff --git a/mina-transport-apr/pom.xml b/mina-transport-apr/pom.xml
index cfdb83b..9f77550 100644
--- a/mina-transport-apr/pom.xml
+++ b/mina-transport-apr/pom.xml
@@ -38,8 +38,8 @@
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-apr</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jni</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/mina/blob/0c090ed1/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
----------------------------------------------------------------------
diff --git a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
index ec0a27d..cbcfd51 100644
--- a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
+++ b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
@@ -76,8 +76,8 @@ class AprLibrary {
private AprLibrary() {
try {
Library.initialize(null);
- } catch (Exception e) {
- throw new RuntimeException("Error loading Apache Portable Runtime (APR).", e);
+ } catch (Throwable t) {
+ throw new RuntimeException("Error loading Apache Portable Runtime (APR).", t);
}
pool = Pool.create(0);
}
http://git-wip-us.apache.org/repos/asf/mina/blob/0c090ed1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dfd3c6d..4630110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
<version.slf4j.log4j12>1.7.7</version.slf4j.log4j12>
<version.slf4j.jcl.over.slf4j>1.7.7</version.slf4j.jcl.over.slf4j>
<version.springframework>2.5.6.SEC03</version.springframework>
- <version.tomcat.apr>5.5.23</version.tomcat.apr>
+ <version.tomcat.apr>8.0.22</version.tomcat.apr>
<version.xbean.spring>4.0</version.xbean.spring>
</properties>
@@ -228,8 +228,8 @@
<!-- Transport -->
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-apr</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jni</artifactId>
<version>${version.tomcat.apr}</version>
</dependency>
[2/2] mina git commit: Fixed an error with the getHostByName(
"localhost") with Java 8" in a test
Posted by el...@apache.org.
Fixed an error with the getHostByName( "localhost") with Java 8" in a test
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/965d9b76
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/965d9b76
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/965d9b76
Branch: refs/heads/2.0
Commit: 965d9b76a453bc287990ed501381f1c8fbeb1c66
Parents: 0c090ed
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Oct 5 17:06:28 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Oct 5 17:06:28 2015 +0200
----------------------------------------------------------------------
.../test/java/org/apache/mina/filter/firewall/SubnetIPv4Test.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/965d9b76/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv4Test.java
----------------------------------------------------------------------
diff --git a/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv4Test.java b/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv4Test.java
index 4dde815..d76d306 100644
--- a/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv4Test.java
+++ b/mina-core/src/test/java/org/apache/mina/filter/firewall/SubnetIPv4Test.java
@@ -28,6 +28,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import org.junit.Test;
+import org.junit.Ignore;
/**
* TODO Add documentation
@@ -90,7 +91,7 @@ public class SubnetIPv4Test {
@Test
public void testToStringLiteral() throws UnknownHostException {
- InetAddress a = InetAddress.getByName("localhost");
+ InetAddress a = InetAddress.getLocalHost();
Subnet mask = new Subnet(a, 32);
assertEquals("127.0.0.1/32", mask.toString());