You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/11/14 05:04:02 UTC
[1/4] git commit: Polished the SSLContextParametersTest
Updated Branches:
refs/heads/camel-2.11.x 202cca153 -> 0b54e7418
refs/heads/camel-2.12.x 12e5d291f -> bf95b99b2
Polished the SSLContextParametersTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c8abb1dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c8abb1dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c8abb1dc
Branch: refs/heads/camel-2.12.x
Commit: c8abb1dc0616136ddac002043cd5504a13160eb6
Parents: 12e5d29
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Nov 14 10:40:41 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Nov 14 11:06:02 2013 +0800
----------------------------------------------------------------------
.../camel/util/jsse/FilterParametersTest.java | 2 +-
.../util/jsse/SSLContextParametersTest.java | 70 +++++++++++++-------
2 files changed, 48 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c8abb1dc/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java
index d3e0a9c..b8b6283 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java
@@ -90,7 +90,7 @@ public class FilterParametersTest extends AbstractJsseParametersTest {
public void test() {
FilterParameters filter = new FilterParameters();
- filter.getInclude().add("asdfsadfsadfsadf");
+ filter.getInclude().add("asdf.*");
filter.getExclude().add("aa");
FilterParameters.Patterns patterns = filter.getPatterns();
http://git-wip-us.apache.org/repos/asf/camel/blob/c8abb1dc/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index 74424f8..cecde3d 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -16,9 +16,12 @@
*/
package org.apache.camel.util.jsse;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
+import java.util.regex.Pattern;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
@@ -29,6 +32,17 @@ import org.apache.camel.CamelContext;
public class SSLContextParametersTest extends AbstractJsseParametersTest {
+ public void testFilter() {
+ SSLContextParameters parameters = new SSLContextParameters();
+
+ Collection<String> result = parameters.filter(null,
+ Arrays.asList(new String[]{"SSLv3", "TLSv1", "TLSv1.1"}),
+ Arrays.asList(new Pattern[]{Pattern.compile("TLS.*")}),
+ Arrays.asList(new Pattern[0]));
+ assertEquals(2, result.size());
+ assertStartsWith(result, "TLS");
+ }
+
public void testPropertyPlaceholders() throws Exception {
CamelContext camelContext = this.createPropertiesPlaceholderAwareContext();
@@ -173,6 +187,8 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
+ assertEquals(0, engine.getEnabledCipherSuites().length);
+ assertEquals(0, socket.getEnabledCipherSuites().length);
assertEquals(0, serverSocket.getEnabledCipherSuites().length);
// Csp on server params
@@ -474,39 +490,41 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
SSLContext context = scp.createSSLContext();
+ CipherSuitesParameters csp = new CipherSuitesParameters();
+ scp.setCipherSuites(csp);
+
SSLEngine engine = context.createSSLEngine();
SSLSocket socket = (SSLSocket) context.getSocketFactory().createSocket();
SSLServerSocket serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertTrue(Arrays.equals(controlEngine.getEnabledProtocols(), engine.getEnabledProtocols()));
- assertTrue(Arrays.equals(controlSocket.getEnabledProtocols(), socket.getEnabledProtocols()));
- checkProtocols(controlServerSocket.getEnabledProtocols(), serverSocket.getEnabledProtocols());
+ assertTrue(Arrays.equals(controlEngine.getEnabledCipherSuites(), engine.getEnabledCipherSuites()));
+ assertTrue(Arrays.equals(controlSocket.getEnabledCipherSuites(), socket.getEnabledCipherSuites()));
+ assertTrue(Arrays.equals(this.getDefaultCipherSuiteIncludes(controlServerSocket.getSupportedCipherSuites()), serverSocket.getEnabledCipherSuites()));
- // empty filter
+ // empty filter
FilterParameters filter = new FilterParameters();
- scp.setSecureSocketProtocolsFilter(filter);
+ scp.setCipherSuitesFilter(filter);
context = scp.createSSLContext();
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertEquals(0, engine.getEnabledProtocols().length);
- assertEquals(0, socket.getEnabledProtocols().length);
- assertEquals(0, serverSocket.getEnabledProtocols().length);
+ assertEquals(0, engine.getEnabledCipherSuites().length);
+ assertEquals(0, socket.getEnabledCipherSuites().length);
+ assertEquals(0, serverSocket.getEnabledCipherSuites().length);
// explicit filter
-
filter.getInclude().add(".*");
context = scp.createSSLContext();
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertTrue(Arrays.equals(controlEngine.getEnabledProtocols(), engine.getEnabledProtocols()));
- assertTrue(Arrays.equals(controlSocket.getEnabledProtocols(), socket.getEnabledProtocols()));
- checkProtocols(controlServerSocket.getEnabledProtocols(), serverSocket.getEnabledProtocols());
-
+ assertEquals(0, engine.getEnabledCipherSuites().length);
+ assertEquals(0, socket.getEnabledCipherSuites().length);
+ assertEquals(0, serverSocket.getEnabledCipherSuites().length);
+
// explicit filter with excludes (excludes overrides)
filter.getExclude().add(".*");
context = scp.createSSLContext();
@@ -514,26 +532,27 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertEquals(0, engine.getEnabledProtocols().length);
- assertEquals(0, socket.getEnabledProtocols().length);
- assertEquals(0, serverSocket.getEnabledProtocols().length);
+ assertEquals(0, engine.getEnabledCipherSuites().length);
+ assertEquals(0, socket.getEnabledCipherSuites().length);
+ assertEquals(0, serverSocket.getEnabledCipherSuites().length);
// explicit filter single include
filter.getInclude().clear();
filter.getExclude().clear();
+ csp.getCipherSuite().add(controlEngine.getEnabledCipherSuites()[0]);
filter.getInclude().add("TLS.*");
context = scp.createSSLContext();
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertTrue(engine.getEnabledProtocols().length >= 1);
- assertStartsWith(engine.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(socket.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+ assertTrue(engine.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(engine.getEnabledCipherSuites(), "TLS");
+ assertTrue(socket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(socket.getEnabledCipherSuites(), "TLS");
+ assertTrue(serverSocket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS");
}
public void testSecureSocketProtocols() throws Exception {
@@ -659,7 +678,6 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
assertEquals(0, serverSocket.getEnabledProtocols().length);
// explicit filter single include
-
filter.getInclude().clear();
filter.getExclude().clear();
filter.getInclude().add("TLS.*");
@@ -739,4 +757,10 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
assertTrue(value.startsWith(prefix));
}
}
+
+ protected void assertStartsWith(Collection<String> values, String prefix) {
+ for (String value : values) {
+ assertTrue(value.startsWith(prefix));
+ }
+ }
}
[2/4] git commit: Fixed CS errors of camel-dns
Posted by ni...@apache.org.
Fixed CS errors of camel-dns
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf95b99b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf95b99b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf95b99b
Branch: refs/heads/camel-2.12.x
Commit: bf95b99b2f89114ef9c8d8f0659b9174672f5799
Parents: c8abb1d
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Nov 14 10:58:20 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Nov 14 12:03:07 2013 +0800
----------------------------------------------------------------------
.../org/apache/camel/component/dns/DnsDigEndpoint.java | 4 ++--
.../apache/camel/component/dns/DnsDigEndpointTest.java | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bf95b99b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
index ff4b03b..2058441 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
@@ -59,9 +59,9 @@ public class DnsDigEndpoint extends DefaultEndpoint {
String dclassValue = exchange.getIn().getHeader(DnsConstants.DNS_CLASS, String.class);
if (dclassValue == null) {
- dclassValue = "";
+ dclassValue = "";
}
-
+
int dclass = DClass.value(dclassValue);
if (dclass == -1) {
// by default, value is IN.
http://git-wip-us.apache.org/repos/asf/camel/blob/bf95b99b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
index 155e065..d7ae208 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
@@ -37,12 +37,12 @@ import org.xbill.DNS.Section;
public class DnsDigEndpointTest extends CamelTestSupport {
private static final String RESPONSE_MONKEY = "\"A Macaque, an old world species of "
- + "monkey native to Southeast Asia|thumb]A monkey is a primate of the "
- + "Haplorrhini suborder and simian infraorder, either an Old World monkey "
- + "or a New World monkey, but excluding apes. There are about 260 known "
- + "living specie\" \"s of monkey. Many are arboreal, although there are "
- + "species that live primarily on the ground, such as baboons... "
- + "http://en.wikipedia.org/wiki/Monkey\"";
+ + "monkey native to Southeast Asia|thumb]A monkey is a primate of the "
+ + "Haplorrhini suborder and simian infraorder, either an Old World monkey "
+ + "or a New World monkey, but excluding apes. There are about 260 known "
+ + "living specie\" \"s of monkey. Many are arboreal, although there are "
+ + "species that live primarily on the ground, such as baboons... "
+ + "http://en.wikipedia.org/wiki/Monkey\"";
@EndpointInject(uri = "mock:result")
protected MockEndpoint resultEndpoint;
[3/4] git commit: Polished the SSLContextParametersTest
Posted by ni...@apache.org.
Polished the SSLContextParametersTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd32a08e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd32a08e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd32a08e
Branch: refs/heads/camel-2.11.x
Commit: fd32a08e85d58e23d96968dffa9dacd7604ba777
Parents: 202cca1
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Nov 14 10:40:41 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Nov 14 12:03:31 2013 +0800
----------------------------------------------------------------------
.../camel/util/jsse/FilterParametersTest.java | 2 +-
.../util/jsse/SSLContextParametersTest.java | 70 +++++++++++++-------
2 files changed, 48 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fd32a08e/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java
index d3e0a9c..b8b6283 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/FilterParametersTest.java
@@ -90,7 +90,7 @@ public class FilterParametersTest extends AbstractJsseParametersTest {
public void test() {
FilterParameters filter = new FilterParameters();
- filter.getInclude().add("asdfsadfsadfsadf");
+ filter.getInclude().add("asdf.*");
filter.getExclude().add("aa");
FilterParameters.Patterns patterns = filter.getPatterns();
http://git-wip-us.apache.org/repos/asf/camel/blob/fd32a08e/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index 74424f8..cecde3d 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -16,9 +16,12 @@
*/
package org.apache.camel.util.jsse;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
+import java.util.regex.Pattern;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
@@ -29,6 +32,17 @@ import org.apache.camel.CamelContext;
public class SSLContextParametersTest extends AbstractJsseParametersTest {
+ public void testFilter() {
+ SSLContextParameters parameters = new SSLContextParameters();
+
+ Collection<String> result = parameters.filter(null,
+ Arrays.asList(new String[]{"SSLv3", "TLSv1", "TLSv1.1"}),
+ Arrays.asList(new Pattern[]{Pattern.compile("TLS.*")}),
+ Arrays.asList(new Pattern[0]));
+ assertEquals(2, result.size());
+ assertStartsWith(result, "TLS");
+ }
+
public void testPropertyPlaceholders() throws Exception {
CamelContext camelContext = this.createPropertiesPlaceholderAwareContext();
@@ -173,6 +187,8 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
+ assertEquals(0, engine.getEnabledCipherSuites().length);
+ assertEquals(0, socket.getEnabledCipherSuites().length);
assertEquals(0, serverSocket.getEnabledCipherSuites().length);
// Csp on server params
@@ -474,39 +490,41 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
SSLContext context = scp.createSSLContext();
+ CipherSuitesParameters csp = new CipherSuitesParameters();
+ scp.setCipherSuites(csp);
+
SSLEngine engine = context.createSSLEngine();
SSLSocket socket = (SSLSocket) context.getSocketFactory().createSocket();
SSLServerSocket serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertTrue(Arrays.equals(controlEngine.getEnabledProtocols(), engine.getEnabledProtocols()));
- assertTrue(Arrays.equals(controlSocket.getEnabledProtocols(), socket.getEnabledProtocols()));
- checkProtocols(controlServerSocket.getEnabledProtocols(), serverSocket.getEnabledProtocols());
+ assertTrue(Arrays.equals(controlEngine.getEnabledCipherSuites(), engine.getEnabledCipherSuites()));
+ assertTrue(Arrays.equals(controlSocket.getEnabledCipherSuites(), socket.getEnabledCipherSuites()));
+ assertTrue(Arrays.equals(this.getDefaultCipherSuiteIncludes(controlServerSocket.getSupportedCipherSuites()), serverSocket.getEnabledCipherSuites()));
- // empty filter
+ // empty filter
FilterParameters filter = new FilterParameters();
- scp.setSecureSocketProtocolsFilter(filter);
+ scp.setCipherSuitesFilter(filter);
context = scp.createSSLContext();
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertEquals(0, engine.getEnabledProtocols().length);
- assertEquals(0, socket.getEnabledProtocols().length);
- assertEquals(0, serverSocket.getEnabledProtocols().length);
+ assertEquals(0, engine.getEnabledCipherSuites().length);
+ assertEquals(0, socket.getEnabledCipherSuites().length);
+ assertEquals(0, serverSocket.getEnabledCipherSuites().length);
// explicit filter
-
filter.getInclude().add(".*");
context = scp.createSSLContext();
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertTrue(Arrays.equals(controlEngine.getEnabledProtocols(), engine.getEnabledProtocols()));
- assertTrue(Arrays.equals(controlSocket.getEnabledProtocols(), socket.getEnabledProtocols()));
- checkProtocols(controlServerSocket.getEnabledProtocols(), serverSocket.getEnabledProtocols());
-
+ assertEquals(0, engine.getEnabledCipherSuites().length);
+ assertEquals(0, socket.getEnabledCipherSuites().length);
+ assertEquals(0, serverSocket.getEnabledCipherSuites().length);
+
// explicit filter with excludes (excludes overrides)
filter.getExclude().add(".*");
context = scp.createSSLContext();
@@ -514,26 +532,27 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertEquals(0, engine.getEnabledProtocols().length);
- assertEquals(0, socket.getEnabledProtocols().length);
- assertEquals(0, serverSocket.getEnabledProtocols().length);
+ assertEquals(0, engine.getEnabledCipherSuites().length);
+ assertEquals(0, socket.getEnabledCipherSuites().length);
+ assertEquals(0, serverSocket.getEnabledCipherSuites().length);
// explicit filter single include
filter.getInclude().clear();
filter.getExclude().clear();
+ csp.getCipherSuite().add(controlEngine.getEnabledCipherSuites()[0]);
filter.getInclude().add("TLS.*");
context = scp.createSSLContext();
engine = context.createSSLEngine();
socket = (SSLSocket) context.getSocketFactory().createSocket();
serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket();
- assertTrue(engine.getEnabledProtocols().length >= 1);
- assertStartsWith(engine.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(socket.getEnabledProtocols(), "TLS");
- assertTrue(socket.getEnabledProtocols().length >= 1);
- assertStartsWith(serverSocket.getEnabledProtocols(), "TLS");
+ assertTrue(engine.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(engine.getEnabledCipherSuites(), "TLS");
+ assertTrue(socket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(socket.getEnabledCipherSuites(), "TLS");
+ assertTrue(serverSocket.getEnabledCipherSuites().length >= 1);
+ assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS");
}
public void testSecureSocketProtocols() throws Exception {
@@ -659,7 +678,6 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
assertEquals(0, serverSocket.getEnabledProtocols().length);
// explicit filter single include
-
filter.getInclude().clear();
filter.getExclude().clear();
filter.getInclude().add("TLS.*");
@@ -739,4 +757,10 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
assertTrue(value.startsWith(prefix));
}
}
+
+ protected void assertStartsWith(Collection<String> values, String prefix) {
+ for (String value : values) {
+ assertTrue(value.startsWith(prefix));
+ }
+ }
}
[4/4] git commit: Fixed CS errors of camel-dns
Posted by ni...@apache.org.
Fixed CS errors of camel-dns
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b54e741
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b54e741
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b54e741
Branch: refs/heads/camel-2.11.x
Commit: 0b54e7418f90eb00aa3527765ea09e9729a19023
Parents: fd32a08
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Nov 14 10:58:20 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Nov 14 12:03:37 2013 +0800
----------------------------------------------------------------------
.../org/apache/camel/component/dns/DnsDigEndpoint.java | 4 ++--
.../apache/camel/component/dns/DnsDigEndpointTest.java | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0b54e741/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
index ff4b03b..2058441 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
@@ -59,9 +59,9 @@ public class DnsDigEndpoint extends DefaultEndpoint {
String dclassValue = exchange.getIn().getHeader(DnsConstants.DNS_CLASS, String.class);
if (dclassValue == null) {
- dclassValue = "";
+ dclassValue = "";
}
-
+
int dclass = DClass.value(dclassValue);
if (dclass == -1) {
// by default, value is IN.
http://git-wip-us.apache.org/repos/asf/camel/blob/0b54e741/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
index 155e065..d7ae208 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
@@ -37,12 +37,12 @@ import org.xbill.DNS.Section;
public class DnsDigEndpointTest extends CamelTestSupport {
private static final String RESPONSE_MONKEY = "\"A Macaque, an old world species of "
- + "monkey native to Southeast Asia|thumb]A monkey is a primate of the "
- + "Haplorrhini suborder and simian infraorder, either an Old World monkey "
- + "or a New World monkey, but excluding apes. There are about 260 known "
- + "living specie\" \"s of monkey. Many are arboreal, although there are "
- + "species that live primarily on the ground, such as baboons... "
- + "http://en.wikipedia.org/wiki/Monkey\"";
+ + "monkey native to Southeast Asia|thumb]A monkey is a primate of the "
+ + "Haplorrhini suborder and simian infraorder, either an Old World monkey "
+ + "or a New World monkey, but excluding apes. There are about 260 known "
+ + "living specie\" \"s of monkey. Many are arboreal, although there are "
+ + "species that live primarily on the ground, such as baboons... "
+ + "http://en.wikipedia.org/wiki/Monkey\"";
@EndpointInject(uri = "mock:result")
protected MockEndpoint resultEndpoint;