Fix merge issue. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/4bc66a6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/4bc66a6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/4bc66a6a
Branch: refs/heads/master Commit: 4bc66a6a9ec549fc00ff2581d7ff68dfa9997adc Parents: 23dc784 Author: JamesBognar <[email protected]> Authored: Sat Feb 4 17:52:58 2017 -0500 Committer: JamesBognar <[email protected]> Committed: Sat Feb 4 17:52:58 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/juneau/ClassMeta.java | 10 ---------- 1 file changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/4bc66a6a/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java index 47e3ca5..90cdd49 100644 --- a/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java +++ b/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java @@ -85,7 +85,6 @@ public final class ClassMeta<T> implements Type { remoteableMethods, // Methods annotated with @Remoteable. Contains all public methods if class is annotated with @Remotable. publicMethods; // All public methods, including static methods. final PojoSwap<?,?>[] childPojoSwaps; // Any PojoSwaps where the normal type is a subclass of this class. -<<<<<<< HEAD final ConcurrentHashMap<Class<?>,PojoSwap<?,?>> childSwapMap, // Maps normal subclasses to PojoSwaps. childUnswapMap; // Maps swap subclasses to PojoSwaps. @@ -94,12 +93,6 @@ public final class ClassMeta<T> implements Type { private final MetadataMap extMeta; // Extended metadata -======= - final ConcurrentHashMap<Class<?>,PojoSwap<?,?>> - childSwapMap, // Maps normal subclasses to PojoSwaps. - childUnswapMap; // Maps swap subclasses to PojoSwaps. ->>>>>>> master - final BeanContext beanContext; // The bean context that created this object. ClassMeta<?> serializedClassMeta, // The transformed class type (if class has swap associated with it). @@ -429,10 +422,7 @@ public final class ClassMeta<T> implements Type { this.remoteableMethods = _remoteableMethods; this.beanFilter = beanFilter; this.pojoSwap = ps; -<<<<<<< HEAD this.extMeta = new MetadataMap(); -======= ->>>>>>> master if (! delayedInit) init();
