You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/09/04 10:21:05 UTC
[1/4] camel git commit: CAMEL-9102: Added loggingSizeLimit >= -1
validation in setLoggingSizeLimit() to avoid further errors
Repository: camel
Updated Branches:
refs/heads/master 23456b66f -> 42c6af57b
CAMEL-9102: Added loggingSizeLimit >= -1 validation in setLoggingSizeLimit() to avoid further errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3644c1f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3644c1f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3644c1f
Branch: refs/heads/master
Commit: d3644c1f8ab1a2538948a8f78f2694ddf6506004
Parents: 066dc59
Author: Bruno Marco Visioli <bv...@stefanini.com>
Authored: Wed Sep 2 17:40:42 2015 -0300
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 4 10:18:39 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d3644c1f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index b8e080d..ad1588c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -41,7 +41,6 @@ import javax.xml.ws.handler.Handler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
import org.apache.camel.Consumer;
@@ -966,9 +965,12 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
}
/**
- * To limit the total size of number of bytes the logger will output when logging feature has been enabled.
+ * To limit the total size of number of bytes the logger will output when logging feature has been enabled and -1 for no limit.
*/
public void setLoggingSizeLimit(int loggingSizeLimit) {
+ if(loggingSizeLimit < -1) {
+ throw new IllegalArgumentException("LoggingSizeLimit must be greater or equal to -1.");
+ }
this.loggingSizeLimit = loggingSizeLimit;
}
[3/4] camel git commit: CAMEL-9102: Changed tabs to whitespace for
identation
Posted by da...@apache.org.
CAMEL-9102: Changed tabs to whitespace for identation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/237a0588
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/237a0588
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/237a0588
Branch: refs/heads/master
Commit: 237a058889c3c7a7f03b026d4fcab7ad0db5652c
Parents: d3644c1
Author: Bruno Marco Visioli <bv...@stefanini.com>
Authored: Wed Sep 2 17:45:51 2015 -0300
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 4 10:18:40 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/237a0588/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index ad1588c..041aad6 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -968,9 +968,9 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
* To limit the total size of number of bytes the logger will output when logging feature has been enabled and -1 for no limit.
*/
public void setLoggingSizeLimit(int loggingSizeLimit) {
- if(loggingSizeLimit < -1) {
- throw new IllegalArgumentException("LoggingSizeLimit must be greater or equal to -1.");
- }
+ if(loggingSizeLimit < -1) {
+ throw new IllegalArgumentException("LoggingSizeLimit must be greater or equal to -1.");
+ }
this.loggingSizeLimit = loggingSizeLimit;
}
[2/4] camel git commit: CAMEL-9102: Changed CxfEndpoint to allow
loggingSizeLimit=-1 for unlimited log size
Posted by da...@apache.org.
CAMEL-9102: Changed CxfEndpoint to allow loggingSizeLimit=-1 for unlimited log size
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/066dc594
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/066dc594
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/066dc594
Branch: refs/heads/master
Commit: 066dc59407a92e33853909e72042e418f1a0cb8f
Parents: 23456b6
Author: Bruno Marco Visioli <bv...@stefanini.com>
Authored: Wed Sep 2 17:21:21 2015 -0300
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 4 10:18:39 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/066dc594/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 9f56ccf..b8e080d 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -319,7 +319,7 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
}
if (isLoggingFeatureEnabled()) {
- if (getLoggingSizeLimit() > 0) {
+ if (getLoggingSizeLimit() != 0) {
sfb.getFeatures().add(new LoggingFeature(getLoggingSizeLimit()));
} else {
sfb.getFeatures().add(new LoggingFeature());
@@ -510,7 +510,7 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
}
if (isLoggingFeatureEnabled()) {
- if (getLoggingSizeLimit() > 0) {
+ if (getLoggingSizeLimit() != 0) {
factoryBean.getFeatures().add(new LoggingFeature(getLoggingSizeLimit()));
} else {
factoryBean.getFeatures().add(new LoggingFeature());
[4/4] camel git commit: Fixed CS. This closes #605.
Posted by da...@apache.org.
Fixed CS. This closes #605.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42c6af57
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42c6af57
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42c6af57
Branch: refs/heads/master
Commit: 42c6af57b30480509755fef97da668d4f290edfb
Parents: 237a058
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Sep 4 10:21:50 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 4 10:21:50 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/42c6af57/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 041aad6..207e88c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -968,7 +968,7 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
* To limit the total size of number of bytes the logger will output when logging feature has been enabled and -1 for no limit.
*/
public void setLoggingSizeLimit(int loggingSizeLimit) {
- if(loggingSizeLimit < -1) {
+ if (loggingSizeLimit < -1) {
throw new IllegalArgumentException("LoggingSizeLimit must be greater or equal to -1.");
}
this.loggingSizeLimit = loggingSizeLimit;