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/11/12 20:43:21 UTC

[06/13] camel git commit: CAMEL-9309: Make it easier to turn on|off java transport over http

CAMEL-9309: Make it easier to turn on|off java transport over http


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

Branch: refs/heads/camel-2.15.x
Commit: 9cbd5867fe73ef07ecba6f16d64689632e3f2a16
Parents: 4f065fe
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 12 19:02:38 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 12 19:02:38 2015 +0100

----------------------------------------------------------------------
 .../apache/camel/component/http/HttpComponent.java | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9cbd5867/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index a2ccd51..851b42b 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -349,23 +349,12 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
         this.httpConfiguration = httpConfiguration;
     }
 
-    public boolean isAllowJavaSerializedObject() {
-        return allowJavaSerializedObject;
-    }
-
     public void setAllowJavaSerializedObject(boolean allowJavaSerializedObject) {
         this.allowJavaSerializedObject = allowJavaSerializedObject;
     }
 
-    /**
-     * Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object
-     * <p/>
-     * This is by default turned off. If you enable this then be aware that Java will deserialize the incoming
-     * data from the request to Java and that can be a potential security risk.
-     */
-    @Override
-    public void setAllowJavaSerializedObject(boolean allowJavaSerializedObject) {
-        // need to override and call super for component docs
-        super.setAllowJavaSerializedObject(allowJavaSerializedObject);
+    public boolean isAllowJavaSerializedObject() {
+        return allowJavaSerializedObject;
     }
+
 }