camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject git commit: Should still support Java 6 as well.
Date Sat, 16 Nov 2013 23:37:54 GMT
Updated Branches:
  refs/heads/camel-2.11.x 88a31de6c -> 286fc1825


Should still support Java 6 as well.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/286fc182
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/286fc182
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/286fc182

Branch: refs/heads/camel-2.11.x
Commit: 286fc1825e3ddc5a5993a25e994492029dfdac00
Parents: 88a31de
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Sun Nov 17 00:33:38 2013 +0100
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Sun Nov 17 00:37:46 2013 +0100

----------------------------------------------------------------------
 .../component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java  | 3 ++-
 .../component/mina/MinaTcpWithInOutUsingPlainSocketTest.java      | 3 ++-
 .../camel/component/mina2/Mina2SslContextParametersUdpTest.java   | 2 +-
 .../mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java          | 3 ++-
 .../component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java    | 3 ++-
 .../org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java  | 2 +-
 .../test/java/org/apache/camel/component/mina2/Mina2UdpTest.java  | 2 +-
 .../component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java    | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/286fc182/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
index 2f452bc..57eb09d 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
@@ -97,7 +97,8 @@ public class MinaTcpLineDelimiterUsingPlainSocketTest extends BaseMinaTest
{
                 return null;
             }
         } finally {
-            IOHelper.close(is, os, soc);
+            IOHelper.close(is, os);
+            soc.close();
         }
 
         // convert the buffer to chars

http://git-wip-us.apache.org/repos/asf/camel/blob/286fc182/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
index c41d78c..b29f27a 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
@@ -97,7 +97,8 @@ public class MinaTcpWithInOutUsingPlainSocketTest extends BaseMinaTest {
                 return null;
             }
         } finally {
-            IOHelper.close(is, os, soc);
+            IOHelper.close(is, os);
+            soc.close();
         }
 
         // convert the buffer to chars

http://git-wip-us.apache.org/repos/asf/camel/blob/286fc182/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
index 1873b14..b47f83e 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
@@ -58,7 +58,7 @@ public class Mina2SslContextParametersUdpTest extends BaseMina2Test {
             }
             Thread.sleep(2000);
         } finally {
-            IOHelper.close(socket);
+            socket.close();
         }
     }
     

http://git-wip-us.apache.org/repos/asf/camel/blob/286fc182/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
index 29a95a4..0444036 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
@@ -97,7 +97,8 @@ public class Mina2TcpLineDelimiterUsingPlainSocketTest extends BaseMina2Test
{
                 return null;
             }
         } finally {
-            IOHelper.close(is, os, soc);
+            IOHelper.close(is, os);
+            soc.close();
         }
 
         // convert the buffer to chars

http://git-wip-us.apache.org/repos/asf/camel/blob/286fc182/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
index f47aa62..7aa7e3c 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
@@ -97,7 +97,8 @@ public class Mina2TcpWithInOutUsingPlainSocketTest extends BaseMina2Test
{
                 return null;
             }
         } finally {
-            IOHelper.close(is, os, soc);
+            IOHelper.close(is, os);
+            soc.close();
         }
 
         // convert the buffer to chars

http://git-wip-us.apache.org/repos/asf/camel/blob/286fc182/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
index 24d2f2d..1511701 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
@@ -59,7 +59,7 @@ public class Mina2UdpConcurrentTest extends BaseMina2Test {
             }
             Thread.sleep(2000);
         } finally {
-            IOHelper.close(socket);
+            socket.close();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/286fc182/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
index 378dd49..3ed8452 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
@@ -59,7 +59,7 @@ public class Mina2UdpTest extends BaseMina2Test {
             }
             Thread.sleep(2000);
         } finally {
-            IOHelper.close(socket);
+            socket.close();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/286fc182/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
index 0fca024..aba1438 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
@@ -59,7 +59,7 @@ public class Mina2UdpWithInOutUsingPlainSocketTest extends BaseMina2Test
{
         LOG.debug("+++ Receiveing data +++");
         socket.receive(receive);
 
-        IOHelper.close(socket);
+        socket.close();
 
         return new String(receive.getData(), 0, receive.getLength());
     }


Mime
View raw message