You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/08/19 15:29:19 UTC
[camel] branch CAMEL-13826 updated (55b43c1 -> 5791584)
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a change to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard 55b43c1 Merging CAMEL-13826 branch with master
new 5791584 Merging CAMEL-13826 branch with master
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (55b43c1)
\
N -- N -- N refs/heads/CAMEL-13826 (5791584)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/test/AvailablePortFinderTest.java | 30 +++++++++++-----------
1 file changed, 15 insertions(+), 15 deletions(-)
[camel] 01/01: Merging CAMEL-13826 branch with master
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 57915848d37f65db04d9cbe87cdb220f2a10ac77
Author: aldettinger <al...@gmail.com>
AuthorDate: Mon Aug 19 16:41:46 2019 +0200
Merging CAMEL-13826 branch with master
---
.../apache/camel/test/AvailablePortFinderTest.java | 38 ++++++++++------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
index 3b96852..c4fdf09 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
@@ -1,19 +1,19 @@
/*
- * * Licensed to the Apache Software Foundation (ASF) under one or more
- * * contributor license agreements. See the NOTICE file distributed with
- * * this work for additional information regarding copyright ownership.
- * * The ASF licenses this file to You under the Apache License, Version 2.0
- * * (the "License"); you may not use this file except in compliance with
- * * the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing, software
- * * distributed under the License is distributed on an "AS IS" BASIS,
- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * * See the License for the specific language governing permissions and
- * * limitations under the License.
- * */
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.test;
import java.net.DatagramSocket;
@@ -24,14 +24,12 @@ import java.net.ServerSocket;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
public class AvailablePortFinderTest {
@Test
- public void testNotAvailableTcpPort() {
+ public void testNotAvailableTcpPort() throws Exception {
int p1 = AvailablePortFinder.getNextAvailable();
ServerSocket socket = new ServerSocket(p1);
int p2 = AvailablePortFinder.getNextAvailable();
@@ -40,7 +38,7 @@ public class AvailablePortFinderTest {
}
@Test
- public void testNotAvailableUdpPort() {
+ public void testNotAvailableUdpPort() throws Exception {
int p1 = AvailablePortFinder.getNextAvailable();
DatagramSocket socket = new DatagramSocket(p1);
int p2 = AvailablePortFinder.getNextAvailable();
@@ -49,7 +47,7 @@ public class AvailablePortFinderTest {
}
@Test
- public void testNotAvailableMulticastPort() {
+ public void testNotAvailableMulticastPort() throws Exception {
int p1 = AvailablePortFinder.getNextAvailable();
MulticastSocket socket = new MulticastSocket(null);
socket.setReuseAddress(false); // true is default for MulticastSocket, we wan to fail if port is occupied