You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2014/07/17 21:15:37 UTC
git commit: ok, groovy is adding it dynamically so skipping class test,
also forbids metaClass name :(
Repository: incubator-fleece
Updated Branches:
refs/heads/master 817ee6820 -> 696361036
ok, groovy is adding it dynamically so skipping class test,also forbids metaClass name :(
Project: http://git-wip-us.apache.org/repos/asf/incubator-fleece/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fleece/commit/69636103
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fleece/tree/69636103
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fleece/diff/69636103
Branch: refs/heads/master
Commit: 6963610365291d88d079a069f86fe975faebf0f6
Parents: 817ee68
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Thu Jul 17 21:15:31 2014 +0200
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Thu Jul 17 21:15:31 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/fleece/mapper/reflection/Mappings.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/69636103/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
----------------------------------------------------------------------
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java b/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
index e8fc5b7..51a2299 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
+++ b/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
@@ -212,8 +212,7 @@ public class Mappings {
final FleeceIgnore writeIgnore = writeMethod != null ? writeMethod.getAnnotation(FleeceIgnore.class) : null;
if (writeMethod != null && writeMethod.getDeclaringClass() != Object.class
&& (writeIgnore == null || writeIgnore.minVersion() >= 0)) {
- if (descriptor.getName().equals("metaClass") &&
- writeMethod.getDeclaringClass().getName().equals("groovy.lang.GroovyObject")) {
+ if (descriptor.getName().equals("metaClass")) {
continue;
}
final Type param = writeMethod.getGenericParameterTypes()[0];
@@ -229,8 +228,7 @@ public class Mappings {
final FleeceIgnore readIgnore = readMethod != null ? readMethod.getAnnotation(FleeceIgnore.class) : null;
if (readMethod != null && readMethod.getDeclaringClass() != Object.class
&& (readIgnore == null || readIgnore.minVersion() >= 0)) {
- if (descriptor.getName().equals("metaClass") &&
- readMethod.getDeclaringClass().getName().equals("groovy.lang.GroovyObject")) {
+ if (descriptor.getName().equals("metaClass")) {
continue;
}