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/07/15 09:36:07 UTC
camel git commit: CAMEL-8972: Remove usage of CollapsedStringAdapter
in Camel model as its not needed anymore and it causes a classloader leak
reported by Apache Tomcat.
Repository: camel
Updated Branches:
refs/heads/master fdcf9182f -> f5ab9e400
CAMEL-8972: Remove usage of CollapsedStringAdapter in Camel model as its not needed anymore and it causes a classloader leak reported by Apache Tomcat.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f5ab9e40
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f5ab9e40
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f5ab9e40
Branch: refs/heads/master
Commit: f5ab9e400aee7c50db6e88a2bbd2f7dae444e740
Parents: fdcf918
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 15 09:42:44 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 15 09:42:44 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/model/IdentifiedType.java | 3 ---
.../org/apache/camel/model/language/ExpressionDefinition.java | 3 ---
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f5ab9e40/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java b/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
index 2dd6aa2..c3da7ea 100644
--- a/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
+++ b/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
@@ -21,8 +21,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
/**
* The unique identifier for a bean. The scope of the identifier is the enclosing bean factory.
@@ -44,7 +42,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class IdentifiedType {
@XmlAttribute
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
private String id;
http://git-wip-us.apache.org/repos/asf/camel/blob/f5ab9e40/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
index c3b87ee..bd3f4e9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
@@ -27,8 +27,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
import org.apache.camel.AfterPropertiesConfigured;
@@ -56,7 +54,6 @@ import org.apache.camel.util.ResourceHelper;
@XmlAccessorType(XmlAccessType.FIELD)
public class ExpressionDefinition implements Expression, Predicate, OtherAttributesAware {
@XmlAttribute
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
private String id;
@XmlValue